Fix query.
Merge branch 'hotfix/1.2.1-Query'