Fixed some issues in the Questionnaire form.