Updated QueryParser according to grammar rules #17