Fixes for team_filter.inc.  cp_tracker is undergoing heavy changes.