Fixed Searchbar issues