diff --git a/docs/en/general/BRA.ics b/docs/en/general/BRA.ics
index 42375f7bc..c10e35e6a 100644
--- a/docs/en/general/BRA.ics
+++ b/docs/en/general/BRA.ics
@@ -2570,6 +2570,15 @@ SUMMARY: BRA 🇧🇷 - 🇨🇷 CRC
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL-BRA
+DTSTAMP:20240902T145000Z
+DTSTART:20240902T145000Z
+DTEND:20240902T151000Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇮🇷 IRI
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1-POL
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
@@ -3423,12 +3432,12 @@ SUMMARY:Individual Event - Grade V
 LOCATION:Château de Versailles
 END:VEVENT
 BEGIN:VEVENT
-UID:20240904T113000Z-goalball-MENS-SEMIFINAL
+UID:20240904T113000Z-goalball-MENS-SEMIFINAL-BRA-UKR
 DTSTAMP:20240904T113000Z
 DTSTART:20240904T113000Z
 DTEND:20240904T123000Z
-DESCRIPTION:Goalball - Men's Semifinal\n🇧🇷 BRA
-SUMMARY:Men's Semifinal
+DESCRIPTION:Goalball - Men's Semifinal
+SUMMARY: BRA 🇧🇷 - 🇺🇦 UKR
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/GBR.ics b/docs/en/general/GBR.ics
index 5be3bb842..8925a2564 100644
--- a/docs/en/general/GBR.ics
+++ b/docs/en/general/GBR.ics
@@ -2885,15 +2885,6 @@ SUMMARY:Men's Sabre Category A Quarterfinal
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
-DTSTAMP:20240903T150000Z
-DTSTART:20240903T150000Z
-DTEND:20240903T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
-SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T150000Z-boccia-MIXED-PAIRS-BC3-PRELIMINARY-ROUND-POOL-B-THA-GB
 DTSTAMP:20240903T150000Z
 DTSTART:20240903T150000Z
@@ -2903,6 +2894,15 @@ SUMMARY: THA 🇹🇭 - 🇬🇧 GBR
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
+UID:20240903T154500Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+DTSTAMP:20240903T154500Z
+DTSTART:20240903T154500Z
+DTEND:20240903T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
+SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T163000Z-para-table-tennis-MENS-SINGLES-MS7-QUARTERFINAL-1-GBR-
 DTSTAMP:20240903T163000Z
 DTSTART:20240903T163000Z
diff --git a/docs/en/general/IRI.ics b/docs/en/general/IRI.ics
index 69bf7b45a..a9a9a8229 100644
--- a/docs/en/general/IRI.ics
+++ b/docs/en/general/IRI.ics
@@ -525,13 +525,12 @@ SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL
+UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL-BRA
 DTSTAMP:20240902T145000Z
 DTSTART:20240902T145000Z
 DTEND:20240902T151000Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal\n🇮🇷 IR
-  Iran
-SUMMARY:Mixed Team Compound Open Quarterfinal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇮🇷 IRI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/KOR.ics b/docs/en/general/KOR.ics
index aaf51ee81..6abf58be6 100644
--- a/docs/en/general/KOR.ics
+++ b/docs/en/general/KOR.ics
@@ -1610,15 +1610,6 @@ SUMMARY: CHO Eun Hye 🇰🇷 - 🇨🇦 Trinity LOWTHIAN
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
-DTSTAMP:20240903T150000Z
-DTSTART:20240903T150000Z
-DTEND:20240903T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
-SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T150000Z-para-table-tennis-WOMENS-SINGLES-WS1-2-QUARTERFINAL-1
 DTSTAMP:20240903T150000Z
 DTSTART:20240903T150000Z
@@ -1629,6 +1620,15 @@ SUMMARY:Women's Singles - WS1-2 - Quarterfinal 1
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240903T154500Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+DTSTAMP:20240903T154500Z
+DTSTART:20240903T154500Z
+DTEND:20240903T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
+SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T163000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-1-KOR-
 DTSTAMP:20240903T163000Z
 DTSTART:20240903T163000Z
diff --git a/docs/en/general/UKR.ics b/docs/en/general/UKR.ics
index 1f8c6fc67..8f8b37c7b 100644
--- a/docs/en/general/UKR.ics
+++ b/docs/en/general/UKR.ics
@@ -2517,6 +2517,15 @@ SUMMARY:R9 - Mixed 50m Rifle Prone SH2 Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240904T113000Z-goalball-MENS-SEMIFINAL-BRA-UKR
+DTSTAMP:20240904T113000Z
+DTSTART:20240904T113000Z
+DTEND:20240904T123000Z
+DESCRIPTION:Goalball - Men's Semifinal
+SUMMARY: BRA 🇧🇷 - 🇺🇦 UKR
+LOCATION:South Paris Arena 6
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T175800Z-para-swimming-MIXED-4X100M-FREESTYLE-RELAY-49-POINTS-F
 DTSTAMP:20240904T175800Z
 DTSTART:20240904T175800Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 769743d1e..a2b8e1460 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -14082,13 +14082,12 @@ SUMMARY:P3 - Mixed 25m Pistol SH1 Final
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL
+UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL-BRA
 DTSTAMP:20240902T145000Z
 DTSTART:20240902T145000Z
 DTEND:20240902T151000Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal\n🇮🇷 IR
-  Iran
-SUMMARY:Mixed Team Compound Open Quarterfinal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇮🇷 IRI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
@@ -16999,12 +16998,12 @@ SUMMARY: Peter ROSENMEIER 🇩🇰 - 🇩🇪 Thomas RAU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
 DTSTAMP:20240903T150000Z
 DTSTART:20240903T150000Z
 DTEND:20240903T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
-SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
+SUMMARY:Men's Singles - MS10 - Semifinal 1
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -17334,6 +17333,15 @@ SUMMARY: Kayode ALABI 🇳🇬 - 🇹🇭 Rungroj THAINIYOM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240903T154500Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+DTSTAMP:20240903T154500Z
+DTSTART:20240903T154500Z
+DTEND:20240903T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
+SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T154500Z-para-table-tennis-WOMENS-SINGLES-WS1-2-QUARTERFINAL-3
 DTSTAMP:20240903T154500Z
 DTSTART:20240903T154500Z
@@ -17778,15 +17786,6 @@ SUMMARY: Natalia KOSMINA 🇺🇦 - 🇯🇵 FURUKAWA Kanami
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T180000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
-DTSTAMP:20240903T180000Z
-DTSTART:20240903T180000Z
-DTEND:20240903T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
-SUMMARY:Men's Singles - MS10 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T180000Z-para-table-tennis-WOMENS-SINGLES-WS11-QUARTERFINAL-3
 DTSTAMP:20240903T180000Z
 DTSTART:20240903T180000Z
@@ -19770,12 +19769,12 @@ SUMMARY:Women's B Individual Time Trial
 LOCATION:Clichy-sous-bois
 END:VEVENT
 BEGIN:VEVENT
-UID:20240904T113000Z-goalball-MENS-SEMIFINAL
+UID:20240904T113000Z-goalball-MENS-SEMIFINAL-BRA-UKR
 DTSTAMP:20240904T113000Z
 DTSTART:20240904T113000Z
 DTEND:20240904T123000Z
-DESCRIPTION:Goalball - Men's Semifinal\n🇧🇷 BRA
-SUMMARY:Men's Semifinal
+DESCRIPTION:Goalball - Men's Semifinal
+SUMMARY: BRA 🇧🇷 - 🇺🇦 UKR
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/goalball/BRA.ics b/docs/en/goalball/BRA.ics
index 1b3c76592..08881eb97 100644
--- a/docs/en/goalball/BRA.ics
+++ b/docs/en/goalball/BRA.ics
@@ -76,12 +76,12 @@ SUMMARY: JPN 🇯🇵 - 🇧🇷 BRA
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240904T113000Z-goalball-MENS-SEMIFINAL
+UID:20240904T113000Z-goalball-MENS-SEMIFINAL-BRA-UKR
 DTSTAMP:20240904T113000Z
 DTSTART:20240904T113000Z
 DTEND:20240904T123000Z
-DESCRIPTION:Goalball - Men's Semifinal\n🇧🇷 BRA
-SUMMARY:Men's Semifinal
+DESCRIPTION:Goalball - Men's Semifinal
+SUMMARY: BRA 🇧🇷 - 🇺🇦 UKR
 LOCATION:South Paris Arena 6
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/UKR.ics b/docs/en/goalball/UKR.ics
index 2be3c96cd..9adbe3a0d 100644
--- a/docs/en/goalball/UKR.ics
+++ b/docs/en/goalball/UKR.ics
@@ -39,4 +39,13 @@ DESCRIPTION:Goalball - Men's Quarterfinal
 SUMMARY: UKR 🇺🇦 - 🇮🇷 IRI
 LOCATION:South Paris Arena 6
 END:VEVENT
+BEGIN:VEVENT
+UID:20240904T113000Z-goalball-MENS-SEMIFINAL-BRA-UKR
+DTSTAMP:20240904T113000Z
+DTSTART:20240904T113000Z
+DTEND:20240904T123000Z
+DESCRIPTION:Goalball - Men's Semifinal
+SUMMARY: BRA 🇧🇷 - 🇺🇦 UKR
+LOCATION:South Paris Arena 6
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/goalball/general.ics b/docs/en/goalball/general.ics
index 21b4a6997..f909ed8f9 100644
--- a/docs/en/goalball/general.ics
+++ b/docs/en/goalball/general.ics
@@ -328,12 +328,12 @@ SUMMARY:Women's Classification Playoff 5/6
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
-UID:20240904T113000Z-goalball-MENS-SEMIFINAL
+UID:20240904T113000Z-goalball-MENS-SEMIFINAL-BRA-UKR
 DTSTAMP:20240904T113000Z
 DTSTART:20240904T113000Z
 DTEND:20240904T123000Z
-DESCRIPTION:Goalball - Men's Semifinal\n🇧🇷 BRA
-SUMMARY:Men's Semifinal
+DESCRIPTION:Goalball - Men's Semifinal
+SUMMARY: BRA 🇧🇷 - 🇺🇦 UKR
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index 8db0862a0..e3b4e4da7 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -3493,6 +3493,15 @@ SUMMARY:R8 - Women's 50m Rifle 3 Positions SH1 Final
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
+DTSTAMP:20240903T150000Z
+DTSTART:20240903T150000Z
+DTEND:20240903T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
+SUMMARY:Men's Singles - MS10 - Semifinal 1
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-2
 DTSTAMP:20240903T150000Z
 DTSTART:20240903T150000Z
@@ -3716,15 +3725,6 @@ SUMMARY:Women's Sabre Category A Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T180000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
-DTSTAMP:20240903T180000Z
-DTSTART:20240903T180000Z
-DTEND:20240903T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
-SUMMARY:Men's Singles - MS10 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T180400Z-para-athletics-WOMENS-100M-T11-FINAL
 DTSTAMP:20240903T180400Z
 DTSTART:20240903T180400Z
diff --git a/docs/en/para-archery/BRA.ics b/docs/en/para-archery/BRA.ics
index bc551664b..5a5ca6ef1 100644
--- a/docs/en/para-archery/BRA.ics
+++ b/docs/en/para-archery/BRA.ics
@@ -161,6 +161,15 @@ SUMMARY: BRA 🇧🇷 - 🇨🇷 CRC
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL-BRA
+DTSTAMP:20240902T145000Z
+DTSTART:20240902T145000Z
+DTEND:20240902T151000Z
+DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇮🇷 IRI
+LOCATION:Invalides
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T075100Z-para-archery-MENS-INDIVIDUAL-RECURVE-OPEN-116-ELIMINAT
 DTSTAMP:20240904T075100Z
 DTSTART:20240904T075100Z
diff --git a/docs/en/para-archery/IRI.ics b/docs/en/para-archery/IRI.ics
index fa9a589c0..0b223d2e0 100644
--- a/docs/en/para-archery/IRI.ics
+++ b/docs/en/para-archery/IRI.ics
@@ -143,13 +143,12 @@ SUMMARY: Hadi NORI 🇮🇷 - 🇬🇧 Nathan MACQUEEN
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL
+UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL-BRA
 DTSTAMP:20240902T145000Z
 DTSTART:20240902T145000Z
 DTEND:20240902T151000Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal\n🇮🇷 IR
-  Iran
-SUMMARY:Mixed Team Compound Open Quarterfinal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇮🇷 IRI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-archery/general.ics b/docs/en/para-archery/general.ics
index d73aa802a..75afbcd0a 100644
--- a/docs/en/para-archery/general.ics
+++ b/docs/en/para-archery/general.ics
@@ -973,13 +973,12 @@ SUMMARY: MAS 🇲🇾 - 🇮🇹 ITA
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL
+UID:20240902T145000Z-para-archery-MIXED-TEAM-COMPOUND-OPEN-QUARTERFINAL-BRA
 DTSTAMP:20240902T145000Z
 DTSTART:20240902T145000Z
 DTEND:20240902T151000Z
-DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal\n🇮🇷 IR
-  Iran
-SUMMARY:Mixed Team Compound Open Quarterfinal
+DESCRIPTION:Para Archery - Mixed Team Compound Open Quarterfinal
+SUMMARY: BRA 🇧🇷 - 🇮🇷 IRI
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/GBR.ics b/docs/en/para-table-tennis/GBR.ics
index 162d0d36a..8d55296d9 100644
--- a/docs/en/para-table-tennis/GBR.ics
+++ b/docs/en/para-table-tennis/GBR.ics
@@ -193,10 +193,10 @@ SUMMARY: Joshua STACEY 🇬🇧 - 🇺🇦 Lev KATS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
-DTSTAMP:20240903T150000Z
-DTSTART:20240903T150000Z
-DTEND:20240903T154500Z
+UID:20240903T154500Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+DTSTAMP:20240903T154500Z
+DTSTART:20240903T154500Z
+DTEND:20240903T163000Z
 DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
 SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
 LOCATION:South Paris Arena 4
diff --git a/docs/en/para-table-tennis/KOR.ics b/docs/en/para-table-tennis/KOR.ics
index 552ed4ad3..df343166a 100644
--- a/docs/en/para-table-tennis/KOR.ics
+++ b/docs/en/para-table-tennis/KOR.ics
@@ -274,15 +274,6 @@ SUMMARY: Fabien LAMIRAULT 🇫🇷 - 🇰🇷 PARK Jin Cheol
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
-DTSTAMP:20240903T150000Z
-DTSTART:20240903T150000Z
-DTEND:20240903T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
-SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T150000Z-para-table-tennis-WOMENS-SINGLES-WS1-2-QUARTERFINAL-1
 DTSTAMP:20240903T150000Z
 DTSTART:20240903T150000Z
@@ -293,6 +284,15 @@ SUMMARY:Women's Singles - WS1-2 - Quarterfinal 1
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240903T154500Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+DTSTAMP:20240903T154500Z
+DTSTART:20240903T154500Z
+DTEND:20240903T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
+SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T163000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-1-KOR-
 DTSTAMP:20240903T163000Z
 DTSTART:20240903T163000Z
diff --git a/docs/en/para-table-tennis/general.ics b/docs/en/para-table-tennis/general.ics
index 81202f5f9..40bc5c24f 100644
--- a/docs/en/para-table-tennis/general.ics
+++ b/docs/en/para-table-tennis/general.ics
@@ -2367,12 +2367,12 @@ SUMMARY: Peter ROSENMEIER 🇩🇰 - 🇩🇪 Thomas RAU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
 DTSTAMP:20240903T150000Z
 DTSTART:20240903T150000Z
 DTEND:20240903T154500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
-SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
+SUMMARY:Men's Singles - MS10 - Semifinal 1
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -2441,6 +2441,15 @@ SUMMARY: Kayode ALABI 🇳🇬 - 🇹🇭 Rungroj THAINIYOM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240903T154500Z-para-table-tennis-MENS-SINGLES-MS1-QUARTERFINAL-4-GBR-
+DTSTAMP:20240903T154500Z
+DTSTART:20240903T154500Z
+DTEND:20240903T163000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS1 - Quarterfinal 4
+SUMMARY: Robert DAVIES 🇬🇧 - 🇰🇷 KIM Hakjin
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T154500Z-para-table-tennis-WOMENS-SINGLES-WS1-2-QUARTERFINAL-3
 DTSTAMP:20240903T154500Z
 DTSTART:20240903T154500Z
@@ -2590,15 +2599,6 @@ SUMMARY: Natalia KOSMINA 🇺🇦 - 🇯🇵 FURUKAWA Kanami
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T180000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
-DTSTAMP:20240903T180000Z
-DTSTART:20240903T180000Z
-DTEND:20240903T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
-SUMMARY:Men's Singles - MS10 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T180000Z-para-table-tennis-WOMENS-SINGLES-WS11-QUARTERFINAL-3
 DTSTAMP:20240903T180000Z
 DTSTART:20240903T180000Z
diff --git a/docs/en/para-table-tennis/medals.ics b/docs/en/para-table-tennis/medals.ics
index 03e5e5191..bb1bc5d3c 100644
--- a/docs/en/para-table-tennis/medals.ics
+++ b/docs/en/para-table-tennis/medals.ics
@@ -310,6 +310,15 @@ SUMMARY:Women's Singles - WS10 - Semifinal 2
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
+DTSTAMP:20240903T150000Z
+DTSTART:20240903T150000Z
+DTEND:20240903T154500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
+SUMMARY:Men's Singles - MS10 - Semifinal 1
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T150000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-2
 DTSTAMP:20240903T150000Z
 DTSTART:20240903T150000Z
@@ -319,15 +328,6 @@ SUMMARY:Men's Singles - MS10 - Semifinal 2
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240903T180000Z-para-table-tennis-MENS-SINGLES-MS10-SEMIFINAL-1
-DTSTAMP:20240903T180000Z
-DTSTART:20240903T180000Z
-DTEND:20240903T184500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS10 - Semifinal 1
-SUMMARY:Men's Singles - MS10 - Semifinal 1
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240903T184500Z-para-table-tennis-MENS-SINGLES-MS5-GOLD-MEDAL-MATCH
 DTSTAMP:20240903T184500Z
 DTSTART:20240903T184500Z
diff --git a/docs/today.html b/docs/today.html
index 09d18a4a3..c39e89ae8 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -30877,7 +30877,7 @@
     <div class="competitor USA">🇺🇸 Yan Xiao GONG </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T145000Z" data-end="20240902T151000Z" data-noc="IRI" >
+<div class="event py-4 " data-start="20240902T145000Z" data-end="20240902T151000Z" data-noc="BRA,IRI" >
  <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>
@@ -30888,7 +30888,13 @@
    PARA ARCHERY
    </div>
    <div>Mixed Team Compound Open Quarterfinal</div>
-    <div class="competitor IRI">🇮🇷 IR Iran </div>
+    <div class="competitors">
+      Brazil
+      🇧🇷
+      -
+      🇮🇷
+      IR Iran
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240902T150000Z" data-end="20240902T154500Z" data-noc="FRA,JPN" >
@@ -36599,25 +36605,18 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240903T150000Z" data-end="20240903T154500Z" data-noc="GBR,KOR" >
+<div class="event py-4 bg-amber-400" data-start="20240903T150000Z" data-end="20240903T154500Z" data-noc="" >
  <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">
-   
+   🏅
    PARA TABLE TENNIS
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div>Men's Singles - MS1 - Quarterfinal 4</div>
-    <div class="competitors">
-      Robert DAVIES
-      🇬🇧
-      -
-      🇰🇷
-      KIM Hakjin
-    </div>
+   <div>Men's Singles - MS10 - Semifinal 1</div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240903T150000Z" data-end="20240903T154500Z" data-noc="" >
@@ -37194,6 +37193,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240903T154500Z" data-end="20240903T163000Z" data-noc="GBR,KOR" >
+ <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">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS1 - Quarterfinal 4</div>
+    <div class="competitors">
+      Robert DAVIES
+      🇬🇧
+      -
+      🇰🇷
+      KIM Hakjin
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240903T154500Z" data-end="20240903T163000Z" data-noc="BRA" >
  <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>
@@ -38027,20 +38047,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 bg-amber-400" data-start="20240903T180000Z" data-end="20240903T184500Z" data-noc="" >
- <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">
-   🏅
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS10 - Semifinal 1</div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240903T180000Z" data-end="20240903T184500Z" data-noc="HKG" >
  <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>
@@ -41652,7 +41658,7 @@
    <div>Women's B Individual Time Trial</div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240904T113000Z" data-end="20240904T123000Z" data-noc="BRA" >
+<div class="event py-4 " data-start="20240904T113000Z" data-end="20240904T123000Z" data-noc="BRA,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>
@@ -41664,7 +41670,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Semifinal</div>
-    <div class="competitor BRA">🇧🇷 Brazil </div>
+    <div class="competitors">
+      Brazil
+      🇧🇷
+      -
+      🇺🇦
+      Ukraine
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240904T113500Z" data-end="20240904T123400Z" data-noc="BRA,CHN,COL,ECU,EGY,INA,KEN,NGR,POR" >