Repair Contribute > Questionnaire > QuestionChoice display
Hierarchic sorting for Questions is supported