Tweak the query