more work on query parse