correct Validator and move to correct location in handler