E1456 Refactoring QuestionnairesController Final Changes