added query parse