Improvement for search query