Re #1633 Rewriting query translations.