Fixed to show only current teams