better query parse