Improved search functionality