fixed bad coding on requirement level
Merge branch 'questionnaire-tweaks' into us-certificate
Merge branch 'us-certificate' into staging