Fluid 4937 - fix for "direct option dynamic gradeNames" support

Thanks to jobara for test case