Fixed search functionality
Fixed search functionality