added more search functionality