clean up incquery queries