Working on making the search results faster