Fixed search functionality