updated Search functionality