Hide some predefined questions to avoid double survey questions

Return existing questions
Merge branch 'MH-541' into dev