Update to search functionality