DC | #3066 | hardcoding questionnaire entity type to be singular