[#813] Sort display questions according to group and question order