Tweak Validation for Question Save
Merge branch 'validation_tweak' into development