Searchbar improvements