diff --git a/docs/general/SRB.ics b/docs/general/SRB.ics
index 65381acc0..6c57d894d 100644
--- a/docs/general/SRB.ics
+++ b/docs/general/SRB.ics
@@ -1235,6 +1235,15 @@ SUMMARY:🛶 Women's Kayak Single 500m Heats
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:Taekwondo - Men -58kg Round of 16
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240807T090000Z-basketball-WOMENS-QUARTERFINAL-SRB-AUS
 DTSTAMP:20240807T090000Z
 DTSTART:20240807T090000Z
diff --git a/docs/general/TUN.ics b/docs/general/TUN.ics
index 053c3cf77..84cbf965e 100644
--- a/docs/general/TUN.ics
+++ b/docs/general/TUN.ics
@@ -573,12 +573,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16
+UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Taekwondo - Men -58kg Round of 16\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 Men -58kg Round of 16
+DESCRIPTION:Taekwondo - Men -58kg Round of 16
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 02ca84033..1af71638a 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -31269,12 +31269,12 @@ SUMMARY:🥋 Women -49kg Round of 16
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16
+UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Taekwondo - Men -58kg Round of 16\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 Men -58kg Round of 16
+DESCRIPTION:Taekwondo - Men -58kg Round of 16
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ja/SRB.ics b/docs/general/ja/SRB.ics
index 69313701c..3d378d566 100644
--- a/docs/general/ja/SRB.ics
+++ b/docs/general/ja/SRB.ics
@@ -1229,6 +1229,15 @@ SUMMARY:🛶 女子カヤックシングル（K-1）500m予選
 LOCATION:ノーティカル ST - フラットウォーター
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-58KG1-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:テコンドー - 男子58kg級1回戦
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:グラン・パレ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240807T090000Z-basketball--SRB-AUS
 DTSTAMP:20240807T090000Z
 DTSTART:20240807T090000Z
diff --git a/docs/general/ja/TUN.ics b/docs/general/ja/TUN.ics
index f65b13939..85809e761 100644
--- a/docs/general/ja/TUN.ics
+++ b/docs/general/ja/TUN.ics
@@ -569,12 +569,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-58KG1
+UID:20240807T085900Z-taekwondo-58KG1-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:テコンドー - 男子58kg級1回戦\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58kg級1回戦
+DESCRIPTION:テコンドー - 男子58kg級1回戦
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ja/general.ics b/docs/general/ja/general.ics
index da6d0fcae..94805442b 100644
--- a/docs/general/ja/general.ics
+++ b/docs/general/ja/general.ics
@@ -31128,12 +31128,12 @@ SUMMARY:🥋 女子49kg級1回戦
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-58KG1
+UID:20240807T085900Z-taekwondo-58KG1-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:テコンドー - 男子58kg級1回戦\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58kg級1回戦
+DESCRIPTION:テコンドー - 男子58kg級1回戦
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ko/SRB.ics b/docs/general/ko/SRB.ics
index aff41761c..4605de0c0 100644
--- a/docs/general/ko/SRB.ics
+++ b/docs/general/ko/SRB.ics
@@ -1226,6 +1226,15 @@ SUMMARY:🛶 여자 카약 1인승 500m 예선
 LOCATION:카누 경기장 - 플랫워터
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo--58KG-16-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:태권도 - 남자 -58kg 16강
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:그랑 팔레
+END:VEVENT
+BEGIN:VEVENT
 UID:20240807T090000Z-basketball--8-SRB-AUS
 DTSTAMP:20240807T090000Z
 DTSTART:20240807T090000Z
diff --git a/docs/general/ko/TUN.ics b/docs/general/ko/TUN.ics
index 3dc4db9ab..afae0f574 100644
--- a/docs/general/ko/TUN.ics
+++ b/docs/general/ko/TUN.ics
@@ -569,12 +569,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo--58KG-16
+UID:20240807T085900Z-taekwondo--58KG-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:태권도 - 남자 -58kg 16강\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 남자 -58kg 16강
+DESCRIPTION:태권도 - 남자 -58kg 16강
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ko/general.ics b/docs/general/ko/general.ics
index 3d5d0a7c4..d55a0615e 100644
--- a/docs/general/ko/general.ics
+++ b/docs/general/ko/general.ics
@@ -31095,12 +31095,12 @@ SUMMARY:🥋 여자 -49kg 16강
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo--58KG-16
+UID:20240807T085900Z-taekwondo--58KG-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:태권도 - 남자 -58kg 16강\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 남자 -58kg 16강
+DESCRIPTION:태권도 - 남자 -58kg 16강
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ru/SRB.ics b/docs/general/ru/SRB.ics
index e239c22ee..577e0fd13 100644
--- a/docs/general/ru/SRB.ics
+++ b/docs/general/ru/SRB.ics
@@ -1240,6 +1240,15 @@ SUMMARY:🛶 Байдарки-одиночки 500м, квалификация (
 LOCATION:Водный ст. - Гладкая вода
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-18-58--TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:Гран-Пале
+END:VEVENT
+BEGIN:VEVENT
 UID:20240807T090000Z-basketball-14--SRB-AUS
 DTSTAMP:20240807T090000Z
 DTSTART:20240807T090000Z
diff --git a/docs/general/ru/TUN.ics b/docs/general/ru/TUN.ics
index e7b35b040..f23104eaf 100644
--- a/docs/general/ru/TUN.ics
+++ b/docs/general/ru/TUN.ics
@@ -577,13 +577,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-18-58-
+UID:20240807T085900Z-taekwondo-18-58--TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)\n🇹🇳 Mohamed Khalil
-  JENDOUBI
-SUMMARY:🥋 1/8 финала, до 58кг (м)
+DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ru/general.ics b/docs/general/ru/general.ics
index 23bf6ff85..417c9feba 100644
--- a/docs/general/ru/general.ics
+++ b/docs/general/ru/general.ics
@@ -31350,13 +31350,12 @@ SUMMARY:🥋 1/8 финала, до 49кг (ж)
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-18-58-
+UID:20240807T085900Z-taekwondo-18-58--TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)\n🇹🇳 Mohamed Khalil
-  JENDOUBI
-SUMMARY:🥋 1/8 финала, до 58кг (м)
+DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/zh/SRB.ics b/docs/general/zh/SRB.ics
index f7c95b129..571417012 100644
--- a/docs/general/zh/SRB.ics
+++ b/docs/general/zh/SRB.ics
@@ -1225,6 +1225,15 @@ SUMMARY:🛶 女子500米单人皮艇分组预赛
 LOCATION:马恩河畔韦尔水上体育场 - 静水
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-5816-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:跆拳道 - 男子58公斤级16强赛
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:巴黎大皇宫
+END:VEVENT
+BEGIN:VEVENT
 UID:20240807T090000Z-basketball-14-SRB-AUS
 DTSTAMP:20240807T090000Z
 DTSTART:20240807T090000Z
diff --git a/docs/general/zh/TUN.ics b/docs/general/zh/TUN.ics
index a2d4669f7..7e75f72a9 100644
--- a/docs/general/zh/TUN.ics
+++ b/docs/general/zh/TUN.ics
@@ -567,12 +567,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-5816
+UID:20240807T085900Z-taekwondo-5816-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:跆拳道 - 男子58公斤级16强赛\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58公斤级16强赛
+DESCRIPTION:跆拳道 - 男子58公斤级16强赛
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/zh/general.ics b/docs/general/zh/general.ics
index dd4e9a23e..76a493b03 100644
--- a/docs/general/zh/general.ics
+++ b/docs/general/zh/general.ics
@@ -31084,12 +31084,12 @@ SUMMARY:🥋 女子49公斤级16强赛
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-5816
+UID:20240807T085900Z-taekwondo-5816-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:跆拳道 - 男子58公斤级16强赛\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58公斤级16强赛
+DESCRIPTION:跆拳道 - 男子58公斤级16强赛
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/ja/today.html b/docs/ja/today.html
index dff810f8c..0b84308cf 100644
--- a/docs/ja/today.html
+++ b/docs/ja/today.html
@@ -71727,7 +71727,7 @@
     <div class="competitor THA">🇹🇭 Panipak WONGPATTANAKIT </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="TUN">
+<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="SRB,TUN">
  <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>
@@ -71739,7 +71739,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
    </div>
    <div>男子58kg級1回戦</div>
-    <div class="competitor TUN">🇹🇳 Mohamed Khalil JENDOUBI </div>
+    <div class="competitors">
+      Mohamed Khalil JENDOUBI
+      🇹🇳
+      -
+      🇷🇸
+      Lev KORNEEV
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240807T090000Z" data-end="20240807T090700Z" data-noc="ALG,UZB">
diff --git a/docs/ko/today.html b/docs/ko/today.html
index c29feafd1..ff43571f4 100644
--- a/docs/ko/today.html
+++ b/docs/ko/today.html
@@ -71727,7 +71727,7 @@
     <div class="competitor THA">🇹🇭 Panipak WONGPATTANAKIT </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="TUN">
+<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="SRB,TUN">
  <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>
@@ -71739,7 +71739,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
    </div>
    <div>남자 -58kg 16강</div>
-    <div class="competitor TUN">🇹🇳 Mohamed Khalil JENDOUBI </div>
+    <div class="competitors">
+      Mohamed Khalil JENDOUBI
+      🇹🇳
+      -
+      🇷🇸
+      Lev KORNEEV
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240807T090000Z" data-end="20240807T090700Z" data-noc="ALG,UZB">
diff --git a/docs/ru/today.html b/docs/ru/today.html
index ebb3fced1..ca2cc18e5 100644
--- a/docs/ru/today.html
+++ b/docs/ru/today.html
@@ -71727,7 +71727,7 @@
     <div class="competitor THA">🇹🇭 Panipak WONGPATTANAKIT </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="TUN">
+<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="SRB,TUN">
  <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>
@@ -71739,7 +71739,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
    </div>
    <div>1/8 финала, до 58кг (м)</div>
-    <div class="competitor TUN">🇹🇳 Mohamed Khalil JENDOUBI </div>
+    <div class="competitors">
+      Mohamed Khalil JENDOUBI
+      🇹🇳
+      -
+      🇷🇸
+      Lev KORNEEV
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240807T090000Z" data-end="20240807T090700Z" data-noc="ALG,UZB">
diff --git a/docs/taekwondo/SRB.ics b/docs/taekwondo/SRB.ics
index 9d06e94c1..a44004742 100644
--- a/docs/taekwondo/SRB.ics
+++ b/docs/taekwondo/SRB.ics
@@ -13,6 +13,15 @@ SUMMARY:🥋 Bocar DIOP 🇸🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:Taekwondo - Men -58kg Round of 16
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T092400Z-taekwondo-MEN-80KG-ROUND-OF-16-SRB-BUR
 DTSTAMP:20240809T092400Z
 DTSTART:20240809T092400Z
diff --git a/docs/taekwondo/TUN.ics b/docs/taekwondo/TUN.ics
index 3a1f893c9..edc10752b 100644
--- a/docs/taekwondo/TUN.ics
+++ b/docs/taekwondo/TUN.ics
@@ -13,12 +13,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16
+UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Taekwondo - Men -58kg Round of 16\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 Men -58kg Round of 16
+DESCRIPTION:Taekwondo - Men -58kg Round of 16
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/general.ics b/docs/taekwondo/general.ics
index 6a96f427e..ee8998cb6 100644
--- a/docs/taekwondo/general.ics
+++ b/docs/taekwondo/general.ics
@@ -95,12 +95,12 @@ SUMMARY:🥋 Women -49kg Round of 16
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16
+UID:20240807T085900Z-taekwondo-MEN-58KG-ROUND-OF-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Taekwondo - Men -58kg Round of 16\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 Men -58kg Round of 16
+DESCRIPTION:Taekwondo - Men -58kg Round of 16
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/ja/SRB.ics b/docs/taekwondo/ja/SRB.ics
index d8005c3f6..c8489a543 100644
--- a/docs/taekwondo/ja/SRB.ics
+++ b/docs/taekwondo/ja/SRB.ics
@@ -13,6 +13,15 @@ SUMMARY:🥋 Bocar DIOP 🇸🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-58KG1-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:テコンドー - 男子58kg級1回戦
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:グラン・パレ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T092400Z-taekwondo-80KG1-SRB-BUR
 DTSTAMP:20240809T092400Z
 DTSTART:20240809T092400Z
diff --git a/docs/taekwondo/ja/TUN.ics b/docs/taekwondo/ja/TUN.ics
index a221ff16f..18dfa9d9b 100644
--- a/docs/taekwondo/ja/TUN.ics
+++ b/docs/taekwondo/ja/TUN.ics
@@ -13,12 +13,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-58KG1
+UID:20240807T085900Z-taekwondo-58KG1-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:テコンドー - 男子58kg級1回戦\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58kg級1回戦
+DESCRIPTION:テコンドー - 男子58kg級1回戦
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/ja/general.ics b/docs/taekwondo/ja/general.ics
index 15a21aba7..60de115aa 100644
--- a/docs/taekwondo/ja/general.ics
+++ b/docs/taekwondo/ja/general.ics
@@ -94,12 +94,12 @@ SUMMARY:🥋 女子49kg級1回戦
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-58KG1
+UID:20240807T085900Z-taekwondo-58KG1-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:テコンドー - 男子58kg級1回戦\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58kg級1回戦
+DESCRIPTION:テコンドー - 男子58kg級1回戦
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:グラン・パレ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/ko/SRB.ics b/docs/taekwondo/ko/SRB.ics
index 40ec03b88..7296c1116 100644
--- a/docs/taekwondo/ko/SRB.ics
+++ b/docs/taekwondo/ko/SRB.ics
@@ -13,6 +13,15 @@ SUMMARY:🥋 Bocar DIOP 🇸🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo--58KG-16-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:태권도 - 남자 -58kg 16강
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:그랑 팔레
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T092400Z-taekwondo--80KG-16-SRB-BUR
 DTSTAMP:20240809T092400Z
 DTSTART:20240809T092400Z
diff --git a/docs/taekwondo/ko/TUN.ics b/docs/taekwondo/ko/TUN.ics
index a5c0e4ec4..391f93f2f 100644
--- a/docs/taekwondo/ko/TUN.ics
+++ b/docs/taekwondo/ko/TUN.ics
@@ -13,12 +13,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo--58KG-16
+UID:20240807T085900Z-taekwondo--58KG-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:태권도 - 남자 -58kg 16강\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 남자 -58kg 16강
+DESCRIPTION:태권도 - 남자 -58kg 16강
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/ko/general.ics b/docs/taekwondo/ko/general.ics
index b228ca059..2ab0d51d4 100644
--- a/docs/taekwondo/ko/general.ics
+++ b/docs/taekwondo/ko/general.ics
@@ -94,12 +94,12 @@ SUMMARY:🥋 여자 -49kg 16강
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo--58KG-16
+UID:20240807T085900Z-taekwondo--58KG-16-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:태권도 - 남자 -58kg 16강\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 남자 -58kg 16강
+DESCRIPTION:태권도 - 남자 -58kg 16강
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:그랑 팔레
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/ru/SRB.ics b/docs/taekwondo/ru/SRB.ics
index 6e80e7834..bbab373c4 100644
--- a/docs/taekwondo/ru/SRB.ics
+++ b/docs/taekwondo/ru/SRB.ics
@@ -13,6 +13,15 @@ SUMMARY:🥋 Bocar DIOP 🇸🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-18-58--TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:Гран-Пале
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T092400Z-taekwondo-18-80--SRB-BUR
 DTSTAMP:20240809T092400Z
 DTSTART:20240809T092400Z
diff --git a/docs/taekwondo/ru/TUN.ics b/docs/taekwondo/ru/TUN.ics
index 2394c04b0..c4f5c63f8 100644
--- a/docs/taekwondo/ru/TUN.ics
+++ b/docs/taekwondo/ru/TUN.ics
@@ -13,13 +13,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-18-58-
+UID:20240807T085900Z-taekwondo-18-58--TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)\n🇹🇳 Mohamed Khalil
-  JENDOUBI
-SUMMARY:🥋 1/8 финала, до 58кг (м)
+DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/ru/general.ics b/docs/taekwondo/ru/general.ics
index ac93b41af..9d012d1bd 100644
--- a/docs/taekwondo/ru/general.ics
+++ b/docs/taekwondo/ru/general.ics
@@ -95,13 +95,12 @@ SUMMARY:🥋 1/8 финала, до 49кг (ж)
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-18-58-
+UID:20240807T085900Z-taekwondo-18-58--TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)\n🇹🇳 Mohamed Khalil
-  JENDOUBI
-SUMMARY:🥋 1/8 финала, до 58кг (м)
+DESCRIPTION:Тхэквондо - 1/8 финала, до 58кг (м)
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:Гран-Пале
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/zh/SRB.ics b/docs/taekwondo/zh/SRB.ics
index ae4b64177..9ce91b353 100644
--- a/docs/taekwondo/zh/SRB.ics
+++ b/docs/taekwondo/zh/SRB.ics
@@ -13,6 +13,15 @@ SUMMARY:🥋 Bocar DIOP 🇸🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
+UID:20240807T085900Z-taekwondo-5816-TUN-SRB
+DTSTAMP:20240807T085900Z
+DTSTART:20240807T085900Z
+DTEND:20240807T091100Z
+DESCRIPTION:跆拳道 - 男子58公斤级16强赛
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
+LOCATION:巴黎大皇宫
+END:VEVENT
+BEGIN:VEVENT
 UID:20240809T092400Z-taekwondo-8016-SRB-BUR
 DTSTAMP:20240809T092400Z
 DTSTART:20240809T092400Z
diff --git a/docs/taekwondo/zh/TUN.ics b/docs/taekwondo/zh/TUN.ics
index d8f7787dc..d0bdc4966 100644
--- a/docs/taekwondo/zh/TUN.ics
+++ b/docs/taekwondo/zh/TUN.ics
@@ -13,12 +13,12 @@ SUMMARY:🥋 Daniela Paola SOUZA 🇲🇽 - 🇹🇳 Ikram DHAHRI
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-5816
+UID:20240807T085900Z-taekwondo-5816-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:跆拳道 - 男子58公斤级16强赛\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58公斤级16强赛
+DESCRIPTION:跆拳道 - 男子58公斤级16强赛
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/taekwondo/zh/general.ics b/docs/taekwondo/zh/general.ics
index 9c668b0e9..8a6c7cf9e 100644
--- a/docs/taekwondo/zh/general.ics
+++ b/docs/taekwondo/zh/general.ics
@@ -94,12 +94,12 @@ SUMMARY:🥋 女子49公斤级16强赛
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
-UID:20240807T085900Z-taekwondo-5816
+UID:20240807T085900Z-taekwondo-5816-TUN-SRB
 DTSTAMP:20240807T085900Z
 DTSTART:20240807T085900Z
 DTEND:20240807T091100Z
-DESCRIPTION:跆拳道 - 男子58公斤级16强赛\n🇹🇳 Mohamed Khalil JENDOUBI
-SUMMARY:🥋 男子58公斤级16强赛
+DESCRIPTION:跆拳道 - 男子58公斤级16强赛
+SUMMARY:🥋 Mohamed Khalil JENDOUBI 🇹🇳 - 🇷🇸 Lev KORNEEV
 LOCATION:巴黎大皇宫
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 9deaa2add..1d4f0bc43 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -71727,7 +71727,7 @@
     <div class="competitor THA">🇹🇭 Panipak WONGPATTANAKIT </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="TUN">
+<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="SRB,TUN">
  <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>
@@ -71739,7 +71739,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men -58kg Round of 16</div>
-    <div class="competitor TUN">🇹🇳 Mohamed Khalil JENDOUBI </div>
+    <div class="competitors">
+      Mohamed Khalil JENDOUBI
+      🇹🇳
+      -
+      🇷🇸
+      Lev KORNEEV
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240807T090000Z" data-end="20240807T090700Z" data-noc="ALG,UZB">
diff --git a/docs/zh/today.html b/docs/zh/today.html
index 591ee2aea..0b3feff97 100644
--- a/docs/zh/today.html
+++ b/docs/zh/today.html
@@ -71727,7 +71727,7 @@
     <div class="competitor THA">🇹🇭 Panipak WONGPATTANAKIT </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="TUN">
+<div class="event py-4" data-start="20240807T085900Z" data-end="20240807T091100Z" data-noc="SRB,TUN">
  <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>
@@ -71739,7 +71739,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
    </div>
    <div>男子58公斤级16强赛</div>
-    <div class="competitor TUN">🇹🇳 Mohamed Khalil JENDOUBI </div>
+    <div class="competitors">
+      Mohamed Khalil JENDOUBI
+      🇹🇳
+      -
+      🇷🇸
+      Lev KORNEEV
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240807T090000Z" data-end="20240807T090700Z" data-noc="ALG,UZB">