refs #15495, clean-up and bug fixes for custom validation patch