Fixed the search bar issue