Fixed the query parser.
Merge branch 'fix_parser'