Refactored QueryParser #54