Improved performance for search.