Updated design of search.