fixes #3697, #3701 - more comprehensive field validations