Ajay/DC | #2978 | bug fix & submitting updating questionnaire code