Final commit for E1456 Refactoring QuestionnariesController