[IMP] improved OForm validation