Issues/pombola/1155 incorrect grouping of questions