Search Bar fixes