Refactored the query parser