Added search functionality back in