Yes, that is exactly what I am about to do. However both the original and the transformed keyword needs to be considered. Until then I will try to resolve this on a local server first, so I only need to apply the fix for you. I am almost sure I can replicate this issue locally as well.
