Fix team selection issue

Team selection feature has been fixed