#407 fix problems with individual naming/grading-setting