query generator changes