CONTRIB-4891 Questionnaire YES/NO questions results not properly shown

The same patch can be applied to the other branches