Fix team selection by teamid in new selector