DC/Ajay | #3947 | Fixing create questionnaire flow and links in html