work on query parse