Improve the query parser

Merged Jan-Hendrik Matthes requested to merge stu113804/currygle:improve-query-parser into master

This MR improves the query parser and fixes some parsing errors I've found in the last days.

Merge request reports