Fixed team filter, grade index