Fix the search UX