Final fixes to search bar