diff --git a/docs/general/EGY.ics b/docs/general/EGY.ics
index e36279fee..7db9ae967 100644
--- a/docs/general/EGY.ics
+++ b/docs/general/EGY.ics
@@ -752,6 +752,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL-IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:Champ-de-Mars Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling-MENS-GRECO-ROMAN-130KG-BRONZE-MEDAL-MATCH-EG
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/general/IRI.ics b/docs/general/IRI.ics
index fcfd06b1d..9d1a18143 100644
--- a/docs/general/IRI.ics
+++ b/docs/general/IRI.ics
@@ -239,13 +239,12 @@ SUMMARY:🧗 Men's Speed, Qualification Seeding
 LOCATION:Le Bourget Climbing Venue
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL
+UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Men's Greco-Roman 97kg Semifinal
+DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 794120ea9..d9e0b6a47 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -7685,13 +7685,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL
+UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Men's Greco-Roman 97kg Semifinal
+DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ja/EGY.ics b/docs/general/ja/EGY.ics
index 504501e4e..82ae9a637 100644
--- a/docs/general/ja/EGY.ics
+++ b/docs/general/ja/EGY.ics
@@ -738,6 +738,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling-97KG-IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:シャン・ド・マルス・アリーナ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling-130KG3-EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/general/ja/IRI.ics b/docs/general/ja/IRI.ics
index 711f71070..7ba24c790 100644
--- a/docs/general/ja/IRI.ics
+++ b/docs/general/ja/IRI.ics
@@ -238,12 +238,12 @@ SUMMARY:🧗 男子スピード予選シーディング
 LOCATION:ル・ブルジェ・スポーツクライミング
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97KG
+UID:20240806T163600Z-wrestling-97KG-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子グレコローマンスタイル97kg級準決勝
+DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ja/general.ics b/docs/general/ja/general.ics
index aa6bfe072..0f7a61ea5 100644
--- a/docs/general/ja/general.ics
+++ b/docs/general/ja/general.ics
@@ -7628,12 +7628,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97KG
+UID:20240806T163600Z-wrestling-97KG-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子グレコローマンスタイル97kg級準決勝
+DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ko/EGY.ics b/docs/general/ko/EGY.ics
index bc3632438..d7ec05185 100644
--- a/docs/general/ko/EGY.ics
+++ b/docs/general/ko/EGY.ics
@@ -738,6 +738,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling--97KG--IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:샹드마르 아레나
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling--130KG--EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/general/ko/IRI.ics b/docs/general/ko/IRI.ics
index 89a156a3b..d5bbff941 100644
--- a/docs/general/ko/IRI.ics
+++ b/docs/general/ko/IRI.ics
@@ -238,12 +238,12 @@ SUMMARY:🧗 남자 스피드, 예선 - 시드전
 LOCATION:르 부르제 클라이밍 경기장
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97KG-
+UID:20240806T163600Z-wrestling--97KG--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 남자 그레코로만형 97kg 준결승
+DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ko/general.ics b/docs/general/ko/general.ics
index 679e4c475..740a00841 100644
--- a/docs/general/ko/general.ics
+++ b/docs/general/ko/general.ics
@@ -7622,12 +7622,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97KG-
+UID:20240806T163600Z-wrestling--97KG--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 남자 그레코로만형 97kg 준결승
+DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ru/EGY.ics b/docs/general/ru/EGY.ics
index b2ba1ba88..fdcfb1b78 100644
--- a/docs/general/ru/EGY.ics
+++ b/docs/general/ru/EGY.ics
@@ -752,6 +752,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling--97--IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:Арена «Марсово поле»
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling--130--EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/general/ru/IRI.ics b/docs/general/ru/IRI.ics
index 0672c49a7..4d45746aa 100644
--- a/docs/general/ru/IRI.ics
+++ b/docs/general/ru/IRI.ics
@@ -239,13 +239,12 @@ SUMMARY:🧗 Скорость, квалификация с посевом (м)
 LOCATION:Скалодром «Ле-Бурже»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97-
+UID:20240806T163600Z-wrestling--97--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Греко-римская, 97кг, полуфинал (м)
+DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ru/general.ics b/docs/general/ru/general.ics
index c00ae63d5..f53b57ffa 100644
--- a/docs/general/ru/general.ics
+++ b/docs/general/ru/general.ics
@@ -7705,13 +7705,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97-
+UID:20240806T163600Z-wrestling--97--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Греко-римская, 97кг, полуфинал (м)
+DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/zh/EGY.ics b/docs/general/zh/EGY.ics
index 7d9b6d79d..317094627 100644
--- a/docs/general/zh/EGY.ics
+++ b/docs/general/zh/EGY.ics
@@ -736,6 +736,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling-97-IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:战神广场
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling-130-EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/general/zh/IRI.ics b/docs/general/zh/IRI.ics
index 7cef5ca15..b2697c7ff 100644
--- a/docs/general/zh/IRI.ics
+++ b/docs/general/zh/IRI.ics
@@ -237,12 +237,12 @@ SUMMARY:🧗 男子速度赛资格赛种子排名
 LOCATION:勒布尔歇运动攀岩馆
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97
+UID:20240806T163600Z-wrestling-97-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子古典式97公斤级半决赛
+DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/zh/general.ics b/docs/general/zh/general.ics
index 80b86c63c..7e720c179 100644
--- a/docs/general/zh/general.ics
+++ b/docs/general/zh/general.ics
@@ -7610,12 +7610,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97
+UID:20240806T163600Z-wrestling-97-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子古典式97公斤级半决赛
+DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/ja/today.html b/docs/ja/today.html
index e240821d9..75e03ef2e 100644
--- a/docs/ja/today.html
+++ b/docs/ja/today.html
@@ -17457,7 +17457,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="IRI">
+<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="EGY,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>
@@ -17469,7 +17469,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男性</span>
    </div>
    <div>男子グレコローマンスタイル97kg級準決勝</div>
-    <div class="competitor IRI">🇮🇷 Mohammadhadi SARAVI </div>
+    <div class="competitors">
+      Mohammadhadi SARAVI
+      🇮🇷
+      -
+      🇪🇬
+      Mohamed GABR
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240806T164300Z" data-end="20240806T165000Z" data-noc="CUB,IND">
diff --git a/docs/ko/today.html b/docs/ko/today.html
index dbe5231c7..40949b5b2 100644
--- a/docs/ko/today.html
+++ b/docs/ko/today.html
@@ -17457,7 +17457,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="IRI">
+<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="EGY,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>
@@ -17469,7 +17469,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">남성</span>
    </div>
    <div>남자 그레코로만형 97kg 준결승</div>
-    <div class="competitor IRI">🇮🇷 Mohammadhadi SARAVI </div>
+    <div class="competitors">
+      Mohammadhadi SARAVI
+      🇮🇷
+      -
+      🇪🇬
+      Mohamed GABR
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240806T164300Z" data-end="20240806T165000Z" data-noc="CUB,IND">
diff --git a/docs/ru/today.html b/docs/ru/today.html
index 30a97fb15..b8d25d84d 100644
--- a/docs/ru/today.html
+++ b/docs/ru/today.html
@@ -17457,7 +17457,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="IRI">
+<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="EGY,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>
@@ -17469,7 +17469,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">М</span>
    </div>
    <div>Греко-римская, 97кг, полуфинал (м)</div>
-    <div class="competitor IRI">🇮🇷 Mohammadhadi SARAVI </div>
+    <div class="competitors">
+      Mohammadhadi SARAVI
+      🇮🇷
+      -
+      🇪🇬
+      Mohamed GABR
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240806T164300Z" data-end="20240806T165000Z" data-noc="CUB,IND">
diff --git a/docs/today.html b/docs/today.html
index fcfe433bc..962947a41 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -17457,7 +17457,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="IRI">
+<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="EGY,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>
@@ -17469,7 +17469,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Greco-Roman 97kg Semifinal</div>
-    <div class="competitor IRI">🇮🇷 Mohammadhadi SARAVI </div>
+    <div class="competitors">
+      Mohammadhadi SARAVI
+      🇮🇷
+      -
+      🇪🇬
+      Mohamed GABR
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240806T164300Z" data-end="20240806T165000Z" data-noc="CUB,IND">
diff --git a/docs/wrestling/EGY.ics b/docs/wrestling/EGY.ics
index 13eb48119..6eb5a2411 100644
--- a/docs/wrestling/EGY.ics
+++ b/docs/wrestling/EGY.ics
@@ -85,6 +85,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL-IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:Champ-de-Mars Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling-MENS-GRECO-ROMAN-130KG-BRONZE-MEDAL-MATCH-EG
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/wrestling/IRI.ics b/docs/wrestling/IRI.ics
index 5c247750c..22ad1a403 100644
--- a/docs/wrestling/IRI.ics
+++ b/docs/wrestling/IRI.ics
@@ -94,13 +94,12 @@ SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇰🇬 Uzur DZHUZUPBEKOV
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL
+UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Men's Greco-Roman 97kg Semifinal
+DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/general.ics b/docs/wrestling/general.ics
index 89a25dcfa..e17cfeb36 100644
--- a/docs/wrestling/general.ics
+++ b/docs/wrestling/general.ics
@@ -796,13 +796,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL
+UID:20240806T163600Z-wrestling-MENS-GRECO-ROMAN-97KG-SEMIFINAL-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Men's Greco-Roman 97kg Semifinal
+DESCRIPTION:Wrestling - Men's Greco-Roman 97kg Semifinal
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/ja/EGY.ics b/docs/wrestling/ja/EGY.ics
index 7a8fb5aab..a06e3db0a 100644
--- a/docs/wrestling/ja/EGY.ics
+++ b/docs/wrestling/ja/EGY.ics
@@ -85,6 +85,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling-97KG-IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:シャン・ド・マルス・アリーナ
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling-130KG3-EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/wrestling/ja/IRI.ics b/docs/wrestling/ja/IRI.ics
index d0d013818..06a7e9556 100644
--- a/docs/wrestling/ja/IRI.ics
+++ b/docs/wrestling/ja/IRI.ics
@@ -94,12 +94,12 @@ SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇰🇬 Uzur DZHUZUPBEKOV
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97KG
+UID:20240806T163600Z-wrestling-97KG-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子グレコローマンスタイル97kg級準決勝
+DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/ja/general.ics b/docs/wrestling/ja/general.ics
index d0678eb72..85b8f3fc3 100644
--- a/docs/wrestling/ja/general.ics
+++ b/docs/wrestling/ja/general.ics
@@ -796,12 +796,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97KG
+UID:20240806T163600Z-wrestling-97KG-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子グレコローマンスタイル97kg級準決勝
+DESCRIPTION:レスリング - 男子グレコローマンスタイル97kg級準決勝
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:シャン・ド・マルス・アリーナ
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/ko/EGY.ics b/docs/wrestling/ko/EGY.ics
index 509a53570..3934633cc 100644
--- a/docs/wrestling/ko/EGY.ics
+++ b/docs/wrestling/ko/EGY.ics
@@ -85,6 +85,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling--97KG--IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:샹드마르 아레나
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling--130KG--EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/wrestling/ko/IRI.ics b/docs/wrestling/ko/IRI.ics
index 2c5b1cc25..fdd20d708 100644
--- a/docs/wrestling/ko/IRI.ics
+++ b/docs/wrestling/ko/IRI.ics
@@ -94,12 +94,12 @@ SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇰🇬 Uzur DZHUZUPBEKOV
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97KG-
+UID:20240806T163600Z-wrestling--97KG--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 남자 그레코로만형 97kg 준결승
+DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/ko/general.ics b/docs/wrestling/ko/general.ics
index 1a97c7ee2..a540e089f 100644
--- a/docs/wrestling/ko/general.ics
+++ b/docs/wrestling/ko/general.ics
@@ -796,12 +796,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97KG-
+UID:20240806T163600Z-wrestling--97KG--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 남자 그레코로만형 97kg 준결승
+DESCRIPTION:레슬링 - 남자 그레코로만형 97kg 준결승
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:샹드마르 아레나
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/ru/EGY.ics b/docs/wrestling/ru/EGY.ics
index 88e0da27f..9ec983209 100644
--- a/docs/wrestling/ru/EGY.ics
+++ b/docs/wrestling/ru/EGY.ics
@@ -85,6 +85,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling--97--IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:Арена «Марсово поле»
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling--130--EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/wrestling/ru/IRI.ics b/docs/wrestling/ru/IRI.ics
index a6163e7ad..895239656 100644
--- a/docs/wrestling/ru/IRI.ics
+++ b/docs/wrestling/ru/IRI.ics
@@ -94,13 +94,12 @@ SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇰🇬 Uzur DZHUZUPBEKOV
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97-
+UID:20240806T163600Z-wrestling--97--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Греко-римская, 97кг, полуфинал (м)
+DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/ru/general.ics b/docs/wrestling/ru/general.ics
index f67eee020..ac8f83be5 100644
--- a/docs/wrestling/ru/general.ics
+++ b/docs/wrestling/ru/general.ics
@@ -796,13 +796,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling--97-
+UID:20240806T163600Z-wrestling--97--IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)\n🇮🇷 Mohammadhadi
-  SARAVI
-SUMMARY:🤼 Греко-римская, 97кг, полуфинал (м)
+DESCRIPTION:Борьба - Греко-римская, 97кг, полуфинал (м)
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:Арена «Марсово поле»
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/zh/EGY.ics b/docs/wrestling/zh/EGY.ics
index f366575fd..172363294 100644
--- a/docs/wrestling/zh/EGY.ics
+++ b/docs/wrestling/zh/EGY.ics
@@ -85,6 +85,15 @@ SUMMARY:🤼 Mohamed GABR 🇪🇬 - 🇦🇸 Abubakar KHASLAKHANAU
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
+UID:20240806T163600Z-wrestling-97-IRI-EGY
+DTSTAMP:20240806T163600Z
+DTSTART:20240806T163600Z
+DTEND:20240806T164300Z
+DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
+LOCATION:战神广场
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T172500Z-wrestling-130-EGY-CHN
 DTSTAMP:20240806T172500Z
 DTSTART:20240806T172500Z
diff --git a/docs/wrestling/zh/IRI.ics b/docs/wrestling/zh/IRI.ics
index 7609123fb..aaf1c6d5c 100644
--- a/docs/wrestling/zh/IRI.ics
+++ b/docs/wrestling/zh/IRI.ics
@@ -94,12 +94,12 @@ SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇰🇬 Uzur DZHUZUPBEKOV
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97
+UID:20240806T163600Z-wrestling-97-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子古典式97公斤级半决赛
+DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/wrestling/zh/general.ics b/docs/wrestling/zh/general.ics
index b02702aa3..fb17dc5f8 100644
--- a/docs/wrestling/zh/general.ics
+++ b/docs/wrestling/zh/general.ics
@@ -796,12 +796,12 @@ SUMMARY:🤼 Artur ALEKSANYAN 🇦🇲 - 🇨🇺 Gabriel Alejandro ROSILLO KIND
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
-UID:20240806T163600Z-wrestling-97
+UID:20240806T163600Z-wrestling-97-IRI-EGY
 DTSTAMP:20240806T163600Z
 DTSTART:20240806T163600Z
 DTEND:20240806T164300Z
-DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛\n🇮🇷 Mohammadhadi SARAVI
-SUMMARY:🤼 男子古典式97公斤级半决赛
+DESCRIPTION:摔跤 - 男子古典式97公斤级半决赛
+SUMMARY:🤼 Mohammadhadi SARAVI 🇮🇷 - 🇪🇬 Mohamed GABR
 LOCATION:战神广场
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/zh/today.html b/docs/zh/today.html
index d1753d2e8..ce1e2e051 100644
--- a/docs/zh/today.html
+++ b/docs/zh/today.html
@@ -17457,7 +17457,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="IRI">
+<div class="event py-4" data-start="20240806T163600Z" data-end="20240806T164300Z" data-noc="EGY,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>
@@ -17469,7 +17469,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">男</span>
    </div>
    <div>男子古典式97公斤级半决赛</div>
-    <div class="competitor IRI">🇮🇷 Mohammadhadi SARAVI </div>
+    <div class="competitors">
+      Mohammadhadi SARAVI
+      🇮🇷
+      -
+      🇪🇬
+      Mohamed GABR
+    </div>
  </div>
 </div>
 <div class="event py-4" data-start="20240806T164300Z" data-end="20240806T165000Z" data-noc="CUB,IND">