Updated search functionality.