Added search functionality and field