updates to parser for queries.