diff --git a/app.py b/app.py
index dcd001b..6bd8562 100644
--- a/app.py
+++ b/app.py
@@ -612,7 +612,7 @@ def session_workspace(
 
     match_id = session_row[1]
     home_team_id = session_row[13]
-    away_team_id = session_row[16]
+    away_team_id = session_row[17]
     referees = get_match_referees(match_id)
     referee_pool = get_all_referees()
     tour_schedule = get_tour_schedule_by_match_id(match_id)
@@ -1009,7 +1009,7 @@ def apply_formation(session_token: str, payload: FormationApplyPayload):
 
     match_id = session_row[1]
     home_team_id = session_row[13]
-    away_team_id = session_row[16]
+    away_team_id = session_row[17]
 
     lineups = get_match_lineup_for_editor(
         match_id=match_id,
@@ -1040,7 +1040,7 @@ def save_formation(session_token: str, payload: FormationSavePayload):
 
     match_id = session_row[1]
     home_team_id = session_row[13]
-    away_team_id = session_row[16]
+    away_team_id = session_row[17]
 
     if payload.side == "home":
         team_id = home_team_id
@@ -1150,7 +1150,7 @@ def api_get_squad_editor_data(session_token: str):
 
     match_id = session_row[1]
     home_team_id = session_row[13]
-    away_team_id = session_row[16]
+    away_team_id = session_row[17]
 
     current_lineup = get_match_lineup_for_editor(
         match_id=match_id,
@@ -1211,7 +1211,7 @@ def api_save_squad_editor_data(
 
     match_id = session_row[1]
     home_team_id = session_row[13]
-    away_team_id = session_row[16]
+    away_team_id = session_row[17]
 
     save_match_lineup_for_editor(
         match_id=match_id,
@@ -1265,8 +1265,8 @@ def get_roster_data(session_token: str, name: str, count_player: int):
     match_id = session_row[1]
     home_team_id = session_row[13]
     home_team_name = session_row[14].replace("«", "").replace("»", "")
-    away_team_id = session_row[16]
-    away_team_name = session_row[17].replace("«", "").replace("»", "")
+    away_team_id = session_row[17]
+    away_team_name = session_row[18].replace("«", "").replace("»", "")
     # print(session_row)
 
     data = build_lineup_json(
@@ -1378,7 +1378,7 @@ def vmix_standings(session_token: str):
         return JSONResponse({"error": "session_not_found"}, status_code=404)
 
     home_team_id = session_row[13]
-    away_team_id = session_row[16]
+    away_team_id = session_row[17]
 
     rows = get_vmix_standings(session_row)
     return [
@@ -1495,7 +1495,7 @@ def vmix_away_formations(session_token: str):
     if not session_row:
         return JSONResponse({"error": "session_not_found"}, status_code=404)
 
-    away_team_id = session_row[16]
+    away_team_id = session_row[17]
     away_team = session_row[17].replace("«", "").replace("»", "")
     rows = get_vmix_team_formations(session_row, away_team_id)
     return build_vmix_formation_response(rows, away_team_id, away_team)