Fix more issues with team name matching