Grades filter fix