Bug fix with new search query