Fixed team filter, grade index
Merge pull request #558 from bellotastudios/midweek-fixes

Fixed team filter, grade index