[OE-5214] use validator rather than hard-coded afterValidate method