Search functionality optimized