Improved search functionality.