Fixed the search feature