Updated FilterByAge and FilterByGrade to work with new Attributes AgeRange and GradeRange