Changed better handling of search using Search API