Make query marginally smarter