diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index fe4c6d1ce..da468588b 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -6550,13 +6550,12 @@ SUMMARY: XUE Juan 🇨🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
 DTSTAMP:20240906T090000Z
 DTSTART:20240906T090000Z
 DTEND:20240906T100000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/ESP.ics b/docs/en/general/ESP.ics
index 55b23e636..7f5956b55 100644
--- a/docs/en/general/ESP.ics
+++ b/docs/en/general/ESP.ics
@@ -2746,6 +2746,16 @@ SUMMARY:Men's Discus Throw - F11 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240905T104500Z-wheelchair-basketball-WOMENS-CLASSIFICATION-QUALIFYING
+DTSTAMP:20240905T104500Z
+DTSTART:20240905T104500Z
+DTEND:20240905T123000Z
+DESCRIPTION:Wheelchair Basketball - Women's Classification Qualifying
+  5-8\n🇪🇸 ESP
+SUMMARY:Women's Classification Qualifying 5-8
+LOCATION:Bercy Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240905T140500Z-para-cycling-road-MENS-H3-ROAD-RACE
 DTSTAMP:20240905T140500Z
 DTSTART:20240905T140500Z
diff --git a/docs/en/general/UKR.ics b/docs/en/general/UKR.ics
index 330be8f81..643763090 100644
--- a/docs/en/general/UKR.ics
+++ b/docs/en/general/UKR.ics
@@ -3579,6 +3579,15 @@ SUMMARY: Viktor DIDUKH 🇺🇦 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
+DTSTAMP:20240906T090000Z
+DTSTART:20240906T090000Z
+DTEND:20240906T100000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240906T091000Z-wheelchair-fencing-WOMENS-PE-CATEGORY-A-TABLE-OF-16-CH
 DTSTAMP:20240906T091000Z
 DTSTART:20240906T091000Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index c10af79fa..5653765bd 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -22378,7 +22378,8 @@ UID:20240905T104500Z-wheelchair-basketball-WOMENS-CLASSIFICATION-QUALIFYING
 DTSTAMP:20240905T104500Z
 DTSTART:20240905T104500Z
 DTEND:20240905T123000Z
-DESCRIPTION:Wheelchair Basketball - Women's Classification Qualifying 5-8
+DESCRIPTION:Wheelchair Basketball - Women's Classification Qualifying
+  5-8\n🇪🇸 ESP
 SUMMARY:Women's Classification Qualifying 5-8
 LOCATION:Bercy Arena
 END:VEVENT
@@ -24108,13 +24109,12 @@ SUMMARY: XUE Juan 🇨🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
 DTSTAMP:20240906T090000Z
 DTSTART:20240906T090000Z
 DTEND:20240906T100000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/CHN.ics b/docs/en/medals/CHN.ics
index ed09d7d72..cc1dffca5 100644
--- a/docs/en/medals/CHN.ics
+++ b/docs/en/medals/CHN.ics
@@ -2089,13 +2089,12 @@ SUMMARY: XUE Juan 🇨🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
 DTSTAMP:20240906T090000Z
 DTSTART:20240906T090000Z
 DTEND:20240906T100000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/UKR.ics b/docs/en/medals/UKR.ics
index 5c68c107e..3138bc472 100644
--- a/docs/en/medals/UKR.ics
+++ b/docs/en/medals/UKR.ics
@@ -1169,6 +1169,15 @@ SUMMARY: Viktor DIDUKH 🇺🇦 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
+DTSTAMP:20240906T090000Z
+DTSTART:20240906T090000Z
+DTEND:20240906T100000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240907T113500Z-para-powerlifting-MENS-UP-TO-88KG-FINAL
 DTSTAMP:20240907T113500Z
 DTSTART:20240907T113500Z
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index 9252d4736..fe8f3006c 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -5851,13 +5851,12 @@ SUMMARY: XUE Juan 🇨🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
 DTSTAMP:20240906T090000Z
 DTSTART:20240906T090000Z
 DTEND:20240906T100000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/CHN.ics b/docs/en/para-table-tennis/CHN.ics
index 862c6740e..d957ccdb7 100644
--- a/docs/en/para-table-tennis/CHN.ics
+++ b/docs/en/para-table-tennis/CHN.ics
@@ -824,13 +824,12 @@ SUMMARY: XUE Juan 🇨🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
 DTSTAMP:20240906T090000Z
 DTSTART:20240906T090000Z
 DTEND:20240906T100000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/UKR.ics b/docs/en/para-table-tennis/UKR.ics
index f08bc962e..54387e2e7 100644
--- a/docs/en/para-table-tennis/UKR.ics
+++ b/docs/en/para-table-tennis/UKR.ics
@@ -193,6 +193,15 @@ SUMMARY: Viktor DIDUKH 🇺🇦 - 🇹🇭 Phisit WANGPHONPHATHANASIRI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
+DTSTAMP:20240906T090000Z
+DTSTART:20240906T090000Z
+DTEND:20240906T100000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240906T100000Z-para-table-tennis-WOMENS-SINGLES-WS9-QUARTERFINAL-2-UK
 DTSTAMP:20240906T100000Z
 DTSTART:20240906T100000Z
diff --git a/docs/en/para-table-tennis/general.ics b/docs/en/para-table-tennis/general.ics
index 86474b304..182f9b189 100644
--- a/docs/en/para-table-tennis/general.ics
+++ b/docs/en/para-table-tennis/general.ics
@@ -3171,13 +3171,12 @@ SUMMARY: XUE Juan 🇨🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
 DTSTAMP:20240906T090000Z
 DTSTART:20240906T090000Z
 DTEND:20240906T100000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/medals.ics b/docs/en/para-table-tennis/medals.ics
index a9df387c1..88ab89a6f 100644
--- a/docs/en/para-table-tennis/medals.ics
+++ b/docs/en/para-table-tennis/medals.ics
@@ -617,13 +617,12 @@ SUMMARY: XUE Juan 🇨🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2
+UID:20240906T090000Z-para-table-tennis-MENS-SINGLES-MS8-SEMIFINAL-2-CHN-UKR
 DTSTAMP:20240906T090000Z
 DTSTART:20240906T090000Z
 DTEND:20240906T100000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2\n🇨🇳
-  ZHAO Shuai
-SUMMARY:Men's Singles - MS8 - Semifinal 2
+DESCRIPTION:Para Table Tennis - Men's Singles - MS8 - Semifinal 2
+SUMMARY: ZHAO Shuai 🇨🇳 - 🇺🇦 Maksym NIKOLENKO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/wheelchair-basketball/ESP.ics b/docs/en/wheelchair-basketball/ESP.ics
index b9406648d..2c8a001c2 100644
--- a/docs/en/wheelchair-basketball/ESP.ics
+++ b/docs/en/wheelchair-basketball/ESP.ics
@@ -85,6 +85,16 @@ SUMMARY: NED 🇳🇱 - 🇪🇸 ESP
 LOCATION:Bercy Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240905T104500Z-wheelchair-basketball-WOMENS-CLASSIFICATION-QUALIFYING
+DTSTAMP:20240905T104500Z
+DTSTART:20240905T104500Z
+DTEND:20240905T123000Z
+DESCRIPTION:Wheelchair Basketball - Women's Classification Qualifying
+  5-8\n🇪🇸 ESP
+SUMMARY:Women's Classification Qualifying 5-8
+LOCATION:Bercy Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240906T114500Z-wheelchair-basketball-MENS-PLAYOFF-7-8
 DTSTAMP:20240906T114500Z
 DTSTART:20240906T114500Z
diff --git a/docs/en/wheelchair-basketball/general.ics b/docs/en/wheelchair-basketball/general.ics
index d5b229cab..b9e4bdd00 100644
--- a/docs/en/wheelchair-basketball/general.ics
+++ b/docs/en/wheelchair-basketball/general.ics
@@ -314,7 +314,8 @@ UID:20240905T104500Z-wheelchair-basketball-WOMENS-CLASSIFICATION-QUALIFYING
 DTSTAMP:20240905T104500Z
 DTSTART:20240905T104500Z
 DTEND:20240905T123000Z
-DESCRIPTION:Wheelchair Basketball - Women's Classification Qualifying 5-8
+DESCRIPTION:Wheelchair Basketball - Women's Classification Qualifying
+  5-8\n🇪🇸 ESP
 SUMMARY:Women's Classification Qualifying 5-8
 LOCATION:Bercy Arena
 END:VEVENT
diff --git a/docs/medals.html b/docs/medals.html
index efa1a4385..e62ccb7af 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -67,13 +67,18 @@
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇨🇳 China</span>
     <span class="inline-block text-center w-1/6 flex-none">59</span>
-    <span class="inline-block text-center w-1/6 flex-none">41</span>
+    <span class="inline-block text-center w-1/6 flex-none">42</span>
     <span class="inline-block text-center w-1/6 flex-none">26</span>
-    <span class="inline-block text-center w-1/6 flex-none">126</span>
+    <span class="inline-block text-center w-1/6 flex-none">127</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
+    <tr>
+      <td class="silver">&#9679;</td>
+      <td>FENG Yanke</td>
+      <td>Wheelchair Fencing - Men's Foil Category B Gold Medal Bout</td>
+    </tr>
     <tr>
       <td class="bronze">&#9679;</td>
       <td>YANG Jinglang</td>
@@ -717,14 +722,19 @@
   <input type="radio" name="accordion">
   <div class="flex collapse-title text-xl font-medium">
     <span class="inline-block flex-auto">🇬🇧 Great Britain</span>
-    <span class="inline-block text-center w-1/6 flex-none">31</span>
+    <span class="inline-block text-center w-1/6 flex-none">32</span>
     <span class="inline-block text-center w-1/6 flex-none">25</span>
     <span class="inline-block text-center w-1/6 flex-none">16</span>
-    <span class="inline-block text-center w-1/6 flex-none">72</span>
+    <span class="inline-block text-center w-1/6 flex-none">73</span>
   </div>
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-09-04</td></tr>
+    <tr>
+      <td class="gold">&#9679;</td>
+      <td>Dimitri COUTYA</td>
+      <td>Wheelchair Fencing - Men's Foil Category B Gold Medal Bout</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Alice TAI</td>
diff --git a/docs/today.html b/docs/today.html
index 085f77e18..f5f81e0b9 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -48657,7 +48657,7 @@
     <div class="competitor ITA">🇮🇹 Italy </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240905T104500Z" data-end="20240905T123000Z" data-noc="" >
+<div class="event py-4 " data-start="20240905T104500Z" data-end="20240905T123000Z" data-noc="ESP" >
  <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>
@@ -48669,6 +48669,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div>Women's Classification Qualifying 5-8</div>
+    <div class="competitor ESP">🇪🇸 Spain </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240905T105700Z" data-end="20240905T110900Z" data-noc="BEL,BRA,CHN,FIN,GBR,MRI,NGR,SUI,USA" >
@@ -51972,7 +51973,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 bg-amber-400" data-start="20240906T090000Z" data-end="20240906T100000Z" data-noc="CHN" >
+<div class="event py-4 bg-amber-400" data-start="20240906T090000Z" data-end="20240906T100000Z" data-noc="CHN,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>
@@ -51984,7 +51985,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles - MS8 - Semifinal 2</div>
-    <div class="competitor CHN">🇨🇳 ZHAO Shuai </div>
+    <div class="competitors">
+      ZHAO Shuai
+      🇨🇳
+      -
+      🇺🇦
+      Maksym NIKOLENKO
+    </div>
  </div>
 </div>
 <div class="event py-4 bg-amber-400" data-start="20240906T090100Z" data-end="20240906T090900Z" data-noc="" >