Added search validation