SUPA-949 SUPA-950 Questions.xml bugfix