Fixed the search issue