We should improve the search functionality.