added query parsing