Ajay/Melanie | #3153 #3128 | Bugfix - Added more validations to questionnaire