Re #1310 Extending query translation.