Searchbox improvements