Added search functionality to handler