Added more search functionality