Upgraded search functionality.