Added group by grade for grade type assessments