support existing queries