FIxed filter by "grade"