Fix search functionality