Improved handling of subantworten and quiz