Added search functionality