Re #1633 Fixing query composition issue.