Improved query search.