diff --git a/docs/en/general/BRA.ics b/docs/en/general/BRA.ics
index 85a2dcd07..7ea7758eb 100644
--- a/docs/en/general/BRA.ics
+++ b/docs/en/general/BRA.ics
@@ -4108,21 +4108,21 @@ SUMMARY:Women's Shot Put - F35 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-BRA-FR
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-FRA-BR
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-BRA-USA
+UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-USA-BRA
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇺🇸 USA
+SUMMARY: USA 🇺🇸 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/CAN.ics b/docs/en/general/CAN.ics
index 723e2202f..e10d8f132 100644
--- a/docs/en/general/CAN.ics
+++ b/docs/en/general/CAN.ics
@@ -2110,6 +2110,15 @@ SUMMARY:Men's Va'a Single 200m - VL2 Heats
 LOCATION:Vaires-sur-Marne Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL-NED-CAN
+DTSTAMP:20240906T193000Z
+DTSTART:20240906T193000Z
+DTEND:20240906T211500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: NED 🇳🇱 - 🇨🇦 CAN
+LOCATION:Bercy Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T073000Z-para-swimming-MENS-200M-INDIVIDUAL-MEDLEY-SM10-HEATS
 DTSTAMP:20240907T073000Z
 DTSTART:20240907T073000Z
diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index 3b5554cb5..d9fe2e6c5 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -6209,12 +6209,12 @@ SUMMARY:Men's 800m - T54 Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-POL-CHN
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-CHN-POL
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: POL 🇵🇱 - 🇨🇳 CHN
+SUMMARY: CHN 🇨🇳 - 🇵🇱 POL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -6762,6 +6762,15 @@ SUMMARY:Women's up to 61kg Final
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL-CHN-USA
+DTSTAMP:20240906T140000Z
+DTSTART:20240906T140000Z
+DTEND:20240906T154500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: CHN 🇨🇳 - 🇺🇸 USA
+LOCATION:Bercy Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240906T150000Z-para-powerlifting-WOMENS-UP-TO-67KG-FINAL
 DTSTAMP:20240906T150000Z
 DTSTART:20240906T150000Z
diff --git a/docs/en/general/FRA.ics b/docs/en/general/FRA.ics
index 64c478b44..6640d9d6d 100644
--- a/docs/en/general/FRA.ics
+++ b/docs/en/general/FRA.ics
@@ -3956,12 +3956,12 @@ SUMMARY: Anatole RUBIN 🇫🇷 - 🇪🇸 Luis Daniel GAVILAN LORENZO
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-BRA-FR
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-FRA-BR
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -4062,12 +4062,12 @@ SUMMARY:Women's Shot Put - F64 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-JPN-FRA
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-FRA-JPN
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: JPN 🇯🇵 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/ITA.ics b/docs/en/general/ITA.ics
index da25df088..9aa6e6b7a 100644
--- a/docs/en/general/ITA.ics
+++ b/docs/en/general/ITA.ics
@@ -2982,12 +2982,12 @@ SUMMARY:Men's Discus Throw - F11 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-ITA-UKR
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal\n🇮🇹 ITA
-SUMMARY:Men's Foil Team Quarterfinal
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
+SUMMARY: ITA 🇮🇹 - 🇺🇦 UKR
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/JPN.ics b/docs/en/general/JPN.ics
index ed8bfe680..896d805a8 100644
--- a/docs/en/general/JPN.ics
+++ b/docs/en/general/JPN.ics
@@ -3171,12 +3171,12 @@ SUMMARY:Mixed 4x50m Medley Relay - 20 Points Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-JPN-FRA
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-FRA-JPN
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: JPN 🇯🇵 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/KOR.ics b/docs/en/general/KOR.ics
index fa29d85cf..b010faa71 100644
--- a/docs/en/general/KOR.ics
+++ b/docs/en/general/KOR.ics
@@ -2149,12 +2149,12 @@ SUMMARY:R6 - Mixed 50m Rifle Prone SH1 Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-THA-KO
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-KOR-TH
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: THA 🇹🇭 - 🇰🇷 KOR
+SUMMARY: KOR 🇰🇷 - 🇹🇭 THA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/NED.ics b/docs/en/general/NED.ics
index ada64ddee..947a711bf 100644
--- a/docs/en/general/NED.ics
+++ b/docs/en/general/NED.ics
@@ -1565,6 +1565,15 @@ SUMMARY: Diede de GROOT 🇳🇱 - 🇯🇵 KAMIJI Yui
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL-NED-CAN
+DTSTAMP:20240906T193000Z
+DTSTART:20240906T193000Z
+DTEND:20240906T211500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: NED 🇳🇱 - 🇨🇦 CAN
+LOCATION:Bercy Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T073000Z-para-swimming-MENS-200M-INDIVIDUAL-MEDLEY-SM10-HEATS
 DTSTAMP:20240907T073000Z
 DTSTART:20240907T073000Z
diff --git a/docs/en/general/POL.ics b/docs/en/general/POL.ics
index 8fa78a8ef..165ae0cc1 100644
--- a/docs/en/general/POL.ics
+++ b/docs/en/general/POL.ics
@@ -1889,12 +1889,12 @@ SUMMARY: Dorota BUCLAW 🇵🇱 - 🇮🇹 Giada ROSSI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-POL-CHN
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-CHN-POL
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: POL 🇵🇱 - 🇨🇳 CHN
+SUMMARY: CHN 🇨🇳 - 🇵🇱 POL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/THA.ics b/docs/en/general/THA.ics
index 873c71733..8c6676827 100644
--- a/docs/en/general/THA.ics
+++ b/docs/en/general/THA.ics
@@ -2189,12 +2189,12 @@ SUMMARY: Yuttajak GLINBANCHEUN 🇹🇭 - 🇩🇪 Thomas SCHMIDBERGER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-THA-KO
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-KOR-TH
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: THA 🇹🇭 - 🇰🇷 KOR
+SUMMARY: KOR 🇰🇷 - 🇹🇭 THA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/UKR.ics b/docs/en/general/UKR.ics
index 36193663c..cd2d8231d 100644
--- a/docs/en/general/UKR.ics
+++ b/docs/en/general/UKR.ics
@@ -3410,6 +3410,15 @@ SUMMARY:Women's 100m - T12 Semi-Finals
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-ITA-UKR
+DTSTAMP:20240905T104000Z
+DTSTART:20240905T104000Z
+DTEND:20240905T115000Z
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
+SUMMARY: ITA 🇮🇹 - 🇺🇦 UKR
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240905T110000Z-para-cycling-road-MENS-H5-ROAD-RACE
 DTSTAMP:20240905T110000Z
 DTSTART:20240905T110000Z
diff --git a/docs/en/general/USA.ics b/docs/en/general/USA.ics
index bda17b2af..8cd9feb91 100644
--- a/docs/en/general/USA.ics
+++ b/docs/en/general/USA.ics
@@ -3307,12 +3307,12 @@ SUMMARY:Women's 400m Freestyle - S10 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-BRA-USA
+UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-USA-BRA
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇺🇸 USA
+SUMMARY: USA 🇺🇸 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -3838,6 +3838,15 @@ SUMMARY:Men's Va'a Single 200m - VL2 Heats
 LOCATION:Vaires-sur-Marne Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL-CHN-USA
+DTSTAMP:20240906T140000Z
+DTSTART:20240906T140000Z
+DTEND:20240906T154500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: CHN 🇨🇳 - 🇺🇸 USA
+LOCATION:Bercy Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T073500Z-para-cycling-road-WOMENS-C1-3-ROAD-RACE
 DTSTAMP:20240907T073500Z
 DTSTART:20240907T073500Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index d36f0d9ab..937a47fef 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -21264,30 +21264,21 @@ SUMMARY:Women's Shot Put - F35 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-BRA-FR
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-FRA-BR
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-BRA-USA
-DTSTAMP:20240905T080000Z
-DTSTART:20240905T080000Z
-DTEND:20240905T091000Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇺🇸 USA
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-THA-KO
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-KOR-TH
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: THA 🇹🇭 - 🇰🇷 KOR
+SUMMARY: KOR 🇰🇷 - 🇹🇭 THA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -21300,6 +21291,15 @@ SUMMARY: UKR 🇺🇦 - 🇮🇶 IRQ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-USA-BRA
+DTSTAMP:20240905T080000Z
+DTSTART:20240905T080000Z
+DTEND:20240905T091000Z
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
+SUMMARY: USA 🇺🇸 - 🇧🇷 BRA
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240905T080500Z-para-athletics-WOMENS-LONG-JUMP-T38-FINAL
 DTSTAMP:20240905T080500Z
 DTSTART:20240905T080500Z
@@ -22287,21 +22287,30 @@ SUMMARY:Men -60 kg J2 Final of Repechage B
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-JPN-FRA
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-CHN-POL
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: JPN 🇯🇵 - 🇫🇷 FRA
+SUMMARY: CHN 🇨🇳 - 🇵🇱 POL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-POL-CHN
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-FRA-JPN
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: POL 🇵🇱 - 🇨🇳 CHN
+SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-ITA-UKR
+DTSTAMP:20240905T104000Z
+DTSTART:20240905T104000Z
+DTEND:20240905T115000Z
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
+SUMMARY: ITA 🇮🇹 - 🇺🇦 UKR
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -22314,15 +22323,6 @@ SUMMARY:Men's Foil Team Quarterfinal
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL
-DTSTAMP:20240905T104000Z
-DTSTART:20240905T104000Z
-DTEND:20240905T115000Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal\n🇮🇹 ITA
-SUMMARY:Men's Foil Team Quarterfinal
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
 UID:20240905T104500Z-wheelchair-basketball-WOMENS-CLASSIFICATION-QUALIFYING
 DTSTAMP:20240905T104500Z
 DTSTART:20240905T104500Z
@@ -25501,12 +25501,12 @@ SUMMARY:Women -57 kg J2 Bronze Medal Contest A
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL
+UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL-CHN-USA
 DTSTAMP:20240906T140000Z
 DTSTART:20240906T140000Z
 DTEND:20240906T154500Z
 DESCRIPTION:Wheelchair Basketball - Women's Semifinal
-SUMMARY:Women's Semifinal
+SUMMARY: CHN 🇨🇳 - 🇺🇸 USA
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
@@ -26050,12 +26050,12 @@ SUMMARY:Women's Épée Category A Gold Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL
+UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL-NED-CAN
 DTSTAMP:20240906T193000Z
 DTSTART:20240906T193000Z
 DTEND:20240906T211500Z
 DESCRIPTION:Wheelchair Basketball - Women's Semifinal
-SUMMARY:Women's Semifinal
+SUMMARY: NED 🇳🇱 - 🇨🇦 CAN
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-basketball/CAN.ics b/docs/en/wheelchair-basketball/CAN.ics
index 650024732..359d689b7 100644
--- a/docs/en/wheelchair-basketball/CAN.ics
+++ b/docs/en/wheelchair-basketball/CAN.ics
@@ -84,4 +84,13 @@ DESCRIPTION:Wheelchair Basketball - Men's Semifinal
 SUMMARY: USA 🇺🇸 - 🇨🇦 CAN
 LOCATION:Bercy Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL-NED-CAN
+DTSTAMP:20240906T193000Z
+DTSTART:20240906T193000Z
+DTEND:20240906T211500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: NED 🇳🇱 - 🇨🇦 CAN
+LOCATION:Bercy Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-basketball/CHN.ics b/docs/en/wheelchair-basketball/CHN.ics
index 241d9c610..4f23ddacc 100644
--- a/docs/en/wheelchair-basketball/CHN.ics
+++ b/docs/en/wheelchair-basketball/CHN.ics
@@ -39,4 +39,13 @@ DESCRIPTION:Wheelchair Basketball - Women's Quarterfinal
 SUMMARY: CHN 🇨🇳 - 🇯🇵 JPN
 LOCATION:Bercy Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL-CHN-USA
+DTSTAMP:20240906T140000Z
+DTSTART:20240906T140000Z
+DTEND:20240906T154500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: CHN 🇨🇳 - 🇺🇸 USA
+LOCATION:Bercy Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-basketball/NED.ics b/docs/en/wheelchair-basketball/NED.ics
index c4ad8b95d..845c3ae12 100644
--- a/docs/en/wheelchair-basketball/NED.ics
+++ b/docs/en/wheelchair-basketball/NED.ics
@@ -84,4 +84,13 @@ DESCRIPTION:Wheelchair Basketball - Men's Classification Qualifying 5-8
 SUMMARY: NED 🇳🇱 - 🇫🇷 FRA
 LOCATION:Bercy Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL-NED-CAN
+DTSTAMP:20240906T193000Z
+DTSTART:20240906T193000Z
+DTEND:20240906T211500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: NED 🇳🇱 - 🇨🇦 CAN
+LOCATION:Bercy Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-basketball/USA.ics b/docs/en/wheelchair-basketball/USA.ics
index 43042c3b7..3275a3c41 100644
--- a/docs/en/wheelchair-basketball/USA.ics
+++ b/docs/en/wheelchair-basketball/USA.ics
@@ -84,4 +84,13 @@ DESCRIPTION:Wheelchair Basketball - Men's Semifinal
 SUMMARY: USA 🇺🇸 - 🇨🇦 CAN
 LOCATION:Bercy Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL-CHN-USA
+DTSTAMP:20240906T140000Z
+DTSTART:20240906T140000Z
+DTEND:20240906T154500Z
+DESCRIPTION:Wheelchair Basketball - Women's Semifinal
+SUMMARY: CHN 🇨🇳 - 🇺🇸 USA
+LOCATION:Bercy Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/wheelchair-basketball/general.ics b/docs/en/wheelchair-basketball/general.ics
index 4f86f4e9b..df5b963d1 100644
--- a/docs/en/wheelchair-basketball/general.ics
+++ b/docs/en/wheelchair-basketball/general.ics
@@ -355,12 +355,12 @@ SUMMARY:Men's Playoff 7-8
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL
+UID:20240906T140000Z-wheelchair-basketball-WOMENS-SEMIFINAL-CHN-USA
 DTSTAMP:20240906T140000Z
 DTSTART:20240906T140000Z
 DTEND:20240906T154500Z
 DESCRIPTION:Wheelchair Basketball - Women's Semifinal
-SUMMARY:Women's Semifinal
+SUMMARY: CHN 🇨🇳 - 🇺🇸 USA
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
@@ -373,12 +373,12 @@ SUMMARY:Men's Playoff 5-6
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL
+UID:20240906T193000Z-wheelchair-basketball-WOMENS-SEMIFINAL-NED-CAN
 DTSTAMP:20240906T193000Z
 DTSTART:20240906T193000Z
 DTEND:20240906T211500Z
 DESCRIPTION:Wheelchair Basketball - Women's Semifinal
-SUMMARY:Women's Semifinal
+SUMMARY: NED 🇳🇱 - 🇨🇦 CAN
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/BRA.ics b/docs/en/wheelchair-fencing/BRA.ics
index 926e0b94d..fdf81ce7a 100644
--- a/docs/en/wheelchair-fencing/BRA.ics
+++ b/docs/en/wheelchair-fencing/BRA.ics
@@ -256,21 +256,21 @@ SUMMARY: Oleg NAUMENKO 🇺🇦 - 🇧🇷 Jovane GUISSONE
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-BRA-FR
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-FRA-BR
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-BRA-USA
+UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-USA-BRA
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇺🇸 USA
+SUMMARY: USA 🇺🇸 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/CHN.ics b/docs/en/wheelchair-fencing/CHN.ics
index b1e9d6655..7c43a2dd2 100644
--- a/docs/en/wheelchair-fencing/CHN.ics
+++ b/docs/en/wheelchair-fencing/CHN.ics
@@ -571,12 +571,12 @@ SUMMARY:Women's Foil Team Quarterfinal
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-POL-CHN
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-CHN-POL
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: POL 🇵🇱 - 🇨🇳 CHN
+SUMMARY: CHN 🇨🇳 - 🇵🇱 POL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/FRA.ics b/docs/en/wheelchair-fencing/FRA.ics
index 80c996643..31254b777 100644
--- a/docs/en/wheelchair-fencing/FRA.ics
+++ b/docs/en/wheelchair-fencing/FRA.ics
@@ -319,21 +319,21 @@ SUMMARY: YU Chui Yee 🇭🇰 - 🇫🇷 Brianna VIDE
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-BRA-FR
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-FRA-BR
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-JPN-FRA
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-FRA-JPN
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: JPN 🇯🇵 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/ITA.ics b/docs/en/wheelchair-fencing/ITA.ics
index a123c5c98..ad0c64b71 100644
--- a/docs/en/wheelchair-fencing/ITA.ics
+++ b/docs/en/wheelchair-fencing/ITA.ics
@@ -418,12 +418,12 @@ SUMMARY: USA 🇺🇸 - 🇮🇹 ITA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-ITA-UKR
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal\n🇮🇹 ITA
-SUMMARY:Men's Foil Team Quarterfinal
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
+SUMMARY: ITA 🇮🇹 - 🇺🇦 UKR
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/JPN.ics b/docs/en/wheelchair-fencing/JPN.ics
index b55c23e55..abce34508 100644
--- a/docs/en/wheelchair-fencing/JPN.ics
+++ b/docs/en/wheelchair-fencing/JPN.ics
@@ -130,12 +130,12 @@ SUMMARY: SAKURAI Anri 🇯🇵 - 🇰🇷 CHO Eun Hye
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-JPN-FRA
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-FRA-JPN
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: JPN 🇯🇵 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/KOR.ics b/docs/en/wheelchair-fencing/KOR.ics
index 93035ff57..97e2076ae 100644
--- a/docs/en/wheelchair-fencing/KOR.ics
+++ b/docs/en/wheelchair-fencing/KOR.ics
@@ -166,12 +166,12 @@ SUMMARY: CHO Eun Hye 🇰🇷 - 🇮🇹 Beatrice Maria VIO GRANDIS
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-THA-KO
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-KOR-TH
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: THA 🇹🇭 - 🇰🇷 KOR
+SUMMARY: KOR 🇰🇷 - 🇹🇭 THA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/POL.ics b/docs/en/wheelchair-fencing/POL.ics
index 356cf34d5..1eaba71ba 100644
--- a/docs/en/wheelchair-fencing/POL.ics
+++ b/docs/en/wheelchair-fencing/POL.ics
@@ -248,12 +248,12 @@ SUMMARY: Michal NALEWAJEK 🇵🇱 - 🇬🇧 Oliver LAM WATSON
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-POL-CHN
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-CHN-POL
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: POL 🇵🇱 - 🇨🇳 CHN
+SUMMARY: CHN 🇨🇳 - 🇵🇱 POL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/THA.ics b/docs/en/wheelchair-fencing/THA.ics
index 700e8f6e6..00241c355 100644
--- a/docs/en/wheelchair-fencing/THA.ics
+++ b/docs/en/wheelchair-fencing/THA.ics
@@ -139,12 +139,12 @@ SUMMARY: Saysunee JANA 🇹🇭 - 🇨🇳 XIAO Rong
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-THA-KO
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-KOR-TH
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: THA 🇹🇭 - 🇰🇷 KOR
+SUMMARY: KOR 🇰🇷 - 🇹🇭 THA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/UKR.ics b/docs/en/wheelchair-fencing/UKR.ics
index a760b989b..8c884e38c 100644
--- a/docs/en/wheelchair-fencing/UKR.ics
+++ b/docs/en/wheelchair-fencing/UKR.ics
@@ -473,6 +473,15 @@ SUMMARY: Hong Kong, China 🇭🇰 - 🇺🇦 Ukraine
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-ITA-UKR
+DTSTAMP:20240905T104000Z
+DTSTART:20240905T104000Z
+DTEND:20240905T115000Z
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
+SUMMARY: ITA 🇮🇹 - 🇺🇦 UKR
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240906T070000Z-wheelchair-fencing-MENS-PE-CATEGORY-A-TABLE-OF-32-CAN-
 DTSTAMP:20240906T070000Z
 DTSTART:20240906T070000Z
diff --git a/docs/en/wheelchair-fencing/USA.ics b/docs/en/wheelchair-fencing/USA.ics
index 4501e9679..ac12882c4 100644
--- a/docs/en/wheelchair-fencing/USA.ics
+++ b/docs/en/wheelchair-fencing/USA.ics
@@ -139,12 +139,12 @@ SUMMARY: Ellen GEDDES 🇺🇸 - 🇬🇪 Irma KHETSURIANI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-BRA-USA
+UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-USA-BRA
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇺🇸 USA
+SUMMARY: USA 🇺🇸 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-fencing/general.ics b/docs/en/wheelchair-fencing/general.ics
index a655e5bfd..99ed6779b 100644
--- a/docs/en/wheelchair-fencing/general.ics
+++ b/docs/en/wheelchair-fencing/general.ics
@@ -2005,30 +2005,21 @@ SUMMARY: GU Haiyan 🇨🇳 - 🇨🇳 ZOU Xufeng
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-BRA-FR
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-FRA-BR
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇫🇷 FRA
+SUMMARY: FRA 🇫🇷 - 🇧🇷 BRA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-BRA-USA
-DTSTAMP:20240905T080000Z
-DTSTART:20240905T080000Z
-DTEND:20240905T091000Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
-SUMMARY: BRA 🇧🇷 - 🇺🇸 USA
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
-UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-THA-KO
+UID:20240905T080000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-TABLE-OF-16-KOR-TH
 DTSTAMP:20240905T080000Z
 DTSTART:20240905T080000Z
 DTEND:20240905T091000Z
 DESCRIPTION:Wheelchair Fencing - Women's Foil Team Table of 16
-SUMMARY: THA 🇹🇭 - 🇰🇷 KOR
+SUMMARY: KOR 🇰🇷 - 🇹🇭 THA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -2041,6 +2032,15 @@ SUMMARY: UKR 🇺🇦 - 🇮🇶 IRQ
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240905T080000Z-wheelchair-fencing-MENS-FOIL-TEAM-TABLE-OF-16-USA-BRA
+DTSTAMP:20240905T080000Z
+DTSTART:20240905T080000Z
+DTEND:20240905T091000Z
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Table of 16
+SUMMARY: USA 🇺🇸 - 🇧🇷 BRA
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240905T093000Z-wheelchair-fencing-WOMENS-FOIL-TEAM-QUARTERFINAL-HKG-U
 DTSTAMP:20240905T093000Z
 DTSTART:20240905T093000Z
@@ -2077,21 +2077,30 @@ SUMMARY:Women's Foil Team Quarterfinal
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-JPN-FRA
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-CHN-POL
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: JPN 🇯🇵 - 🇫🇷 FRA
+SUMMARY: CHN 🇨🇳 - 🇵🇱 POL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-POL-CHN
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-FRA-JPN
 DTSTAMP:20240905T104000Z
 DTSTART:20240905T104000Z
 DTEND:20240905T115000Z
 DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
-SUMMARY: POL 🇵🇱 - 🇨🇳 CHN
+SUMMARY: FRA 🇫🇷 - 🇯🇵 JPN
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL-ITA-UKR
+DTSTAMP:20240905T104000Z
+DTSTART:20240905T104000Z
+DTEND:20240905T115000Z
+DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal
+SUMMARY: ITA 🇮🇹 - 🇺🇦 UKR
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -2104,15 +2113,6 @@ SUMMARY:Men's Foil Team Quarterfinal
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240905T104000Z-wheelchair-fencing-MENS-FOIL-TEAM-QUARTERFINAL
-DTSTAMP:20240905T104000Z
-DTSTART:20240905T104000Z
-DTEND:20240905T115000Z
-DESCRIPTION:Wheelchair Fencing - Men's Foil Team Quarterfinal\n🇮🇹 ITA
-SUMMARY:Men's Foil Team Quarterfinal
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
 UID:20240905T121000Z-wheelchair-fencing-MENS-FOIL-TEAM-SEMIFINAL
 DTSTAMP:20240905T121000Z
 DTSTART:20240905T121000Z
diff --git a/docs/today.html b/docs/today.html
index fe92ec3bb..71c7f3aff 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -46531,32 +46531,11 @@
    </div>
    <div>Women's Foil Team Table of 16</div>
     <div class="competitors">
-      Brazil
-      🇧🇷
-      -
-      🇫🇷
       France
-    </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240905T080000Z" data-end="20240905T091000Z" data-noc="BRA,USA" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR FENCING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Foil Team Table of 16</div>
-    <div class="competitors">
-      Brazil
-      🇧🇷
+      🇫🇷
       -
-      🇺🇸
-      United States
+      🇧🇷
+      Brazil
     </div>
  </div>
 </div>
@@ -46573,11 +46552,11 @@
    </div>
    <div>Women's Foil Team Table of 16</div>
     <div class="competitors">
-      Thailand
-      🇹🇭
-      -
-      🇰🇷
       Korea
+      🇰🇷
+      -
+      🇹🇭
+      Thailand
     </div>
  </div>
 </div>
@@ -46602,6 +46581,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240905T080000Z" data-end="20240905T091000Z" data-noc="BRA,USA" >
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
+  <span class="time-start">__:__</span>
+  <div class="time-end text-xs">__:__</div>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   WHEELCHAIR FENCING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Foil Team Table of 16</div>
+    <div class="competitors">
+      United States
+      🇺🇸
+      -
+      🇧🇷
+      Brazil
+    </div>
+ </div>
+</div>
 <div class="event py-4 bg-amber-400" data-start="20240905T080500Z" data-end="20240905T092600Z" data-noc="CHN,COL,FIN,FRA,GBR,GER,HUN,POL,USA" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -48528,27 +48528,6 @@
    <div>Men -60 kg J2 Final of Repechage B</div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240905T104000Z" data-end="20240905T115000Z" data-noc="FRA,JPN" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR FENCING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Foil Team Quarterfinal</div>
-    <div class="competitors">
-      Japan
-      🇯🇵
-      -
-      🇫🇷
-      France
-    </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240905T104000Z" data-end="20240905T115000Z" data-noc="CHN,POL" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -48562,11 +48541,53 @@
    </div>
    <div>Men's Foil Team Quarterfinal</div>
     <div class="competitors">
-      Poland
-      🇵🇱
-      -
-      🇨🇳
       China
+      🇨🇳
+      -
+      🇵🇱
+      Poland
+    </div>
+ </div>
+</div>
+<div class="event py-4 " data-start="20240905T104000Z" data-end="20240905T115000Z" data-noc="FRA,JPN" >
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
+  <span class="time-start">__:__</span>
+  <div class="time-end text-xs">__:__</div>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   WHEELCHAIR FENCING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Foil Team Quarterfinal</div>
+    <div class="competitors">
+      France
+      🇫🇷
+      -
+      🇯🇵
+      Japan
+    </div>
+ </div>
+</div>
+<div class="event py-4 " data-start="20240905T104000Z" data-end="20240905T115000Z" data-noc="ITA,UKR" >
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
+  <span class="time-start">__:__</span>
+  <div class="time-end text-xs">__:__</div>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   WHEELCHAIR FENCING
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Foil Team Quarterfinal</div>
+    <div class="competitors">
+      Italy
+      🇮🇹
+      -
+      🇺🇦
+      Ukraine
     </div>
  </div>
 </div>
@@ -48585,21 +48606,6 @@
     <div class="competitor GBR">🇬🇧 Great Britain </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240905T104000Z" data-end="20240905T115000Z" data-noc="ITA" >
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   WHEELCHAIR FENCING
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Foil Team Quarterfinal</div>
-    <div class="competitor ITA">🇮🇹 Italy </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240905T104500Z" data-end="20240905T123000Z" data-noc="ESP,GER" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
@@ -54395,7 +54401,7 @@
    <div>Women -57 kg J2 Bronze Medal Contest A</div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240906T140000Z" data-end="20240906T154500Z" data-noc="" >
+<div class="event py-4 " data-start="20240906T140000Z" data-end="20240906T154500Z" data-noc="CHN,USA" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -54407,6 +54413,13 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div>Women's Semifinal</div>
+    <div class="competitors">
+      China
+      🇨🇳
+      -
+      🇺🇸
+      United States
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-orange-700" data-start="20240906T140800Z" data-end="20240906T141600Z" data-noc="" >
@@ -55258,7 +55271,7 @@
    <div>Women's Épée Category A Gold Medal Bout</div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240906T193000Z" data-end="20240906T211500Z" data-noc="" >
+<div class="event py-4 " data-start="20240906T193000Z" data-end="20240906T211500Z" data-noc="CAN,NED" >
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -55270,6 +55283,13 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div>Women's Semifinal</div>
+    <div class="competitors">
+      Netherlands
+      🇳🇱
+      -
+      🇨🇦
+      Canada
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240907T073000Z" data-end="20240907T073600Z" data-noc="GEO,KAZ" >