Fix issues with extra null categories sometimes returned by TEAMS.