Small changes to the query