Quick fixes to search functionality.