Extended the search functionality.