Fixing tokens in query

theo lem requested to merge fix-query-tokens into master

Merge request reports