support new style queries