Improve performance of search engine