Added grade level filtering