Fixes to Additional Questions XML arrangement