Updated QueryParser #17

Changes to be continued tomorrow