Added search functionality!