Fixing the search bar issue