More changes in queries