Fix rubric handling, saving