filter by grade; recalculate values