Fix persistence of choices, question groupings, add new schema