Modified search functionality