fixes #3697 - more comprehensive field validations
fixes #3697, #3701 - more comprehensive field validations