Added search helper functionality