diff --git a/docs/fencing/BEL.ics b/docs/fencing/BEL.ics
index 3d1307601..438b50539 100644
--- a/docs/fencing/BEL.ics
+++ b/docs/fencing/BEL.ics
@@ -13,13 +13,12 @@ SUMMARY:🤺 Alexis BAYARD 🇨🇭 - 🇧🇪 Neisser LOYOLA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-HUN-BEL
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇧🇪 Neisser
-  LOYOLA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Gergely SIKLOSI 🇭🇺 - 🇧🇪 Neisser LOYOLA
 LOCATION:Grand Palais
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/fencing/CHN.ics b/docs/fencing/CHN.ics
index 41ecab529..38c2b2b70 100644
--- a/docs/fencing/CHN.ics
+++ b/docs/fencing/CHN.ics
@@ -121,12 +121,12 @@ SUMMARY:🤺 HUANG Qianqian 🇨🇳 - 🇺🇸 Lee KIEFER
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-CHN-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇨🇳 WANG Zijie
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 WANG Zijie 🇨🇳 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/HUN.ics b/docs/fencing/HUN.ics
index 0745d4a61..8ce45d927 100644
--- a/docs/fencing/HUN.ics
+++ b/docs/fencing/HUN.ics
@@ -139,6 +139,15 @@ SUMMARY:🤺 Tibor ANDRASFI 🇭🇺 - 🇻🇪 Grabiel LUGO
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-HUN-BEL
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Gergely SIKLOSI 🇭🇺 - 🇧🇪 Neisser LOYOLA
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T070000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-64-VEN-HUN
 DTSTAMP:20240729T070000Z
 DTSTART:20240729T070000Z
diff --git a/docs/fencing/ITA.ics b/docs/fencing/ITA.ics
index 54e699255..e8a073762 100644
--- a/docs/fencing/ITA.ics
+++ b/docs/fencing/ITA.ics
@@ -202,13 +202,21 @@ SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇮🇹 Andrea SANTARELLI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-ITA-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇮🇹 Federico
-  VISMARA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Davide di VEROLI 🇮🇹 - 🇯🇵 YAMADA Masaru
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-KAZ-ITA
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Elmir ALIMZHANOV 🇰🇿 - 🇮🇹 Federico VISMARA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/JPN.ics b/docs/fencing/JPN.ics
index 444bfd0b7..226eab10d 100644
--- a/docs/fencing/JPN.ics
+++ b/docs/fencing/JPN.ics
@@ -103,12 +103,21 @@ SUMMARY:🤺 MINOBE Kazuyasu 🇯🇵 - 🇫🇷 Yannick BOREL
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-CHN-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇯🇵 YAMADA Masaru
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 WANG Zijie 🇨🇳 - 🇯🇵 KANO Koki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-ITA-JPN
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Davide di VEROLI 🇮🇹 - 🇯🇵 YAMADA Masaru
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/KAZ.ics b/docs/fencing/KAZ.ics
index a91da824f..d49605dba 100644
--- a/docs/fencing/KAZ.ics
+++ b/docs/fencing/KAZ.ics
@@ -49,6 +49,15 @@ SUMMARY:🤺 Ruslan KURBANOV 🇰🇿 - 🇫🇷 Romain CANNONE
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-KAZ-ITA
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Elmir ALIMZHANOV 🇰🇿 - 🇮🇹 Federico VISMARA
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T070000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-64-KAZ-ALG
 DTSTAMP:20240729T070000Z
 DTSTART:20240729T070000Z
diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 0cdee67b5..9105bd501 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -1075,41 +1075,39 @@ SUMMARY:🤺 Ruslan KURBANOV 🇰🇿 - 🇫🇷 Romain CANNONE
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-CHN-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇯🇵 YAMADA Masaru
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 WANG Zijie 🇨🇳 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-HUN-BEL
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇧🇪 Neisser
-  LOYOLA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Gergely SIKLOSI 🇭🇺 - 🇧🇪 Neisser LOYOLA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-ITA-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇮🇹 Federico
-  VISMARA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Davide di VEROLI 🇮🇹 - 🇯🇵 YAMADA Masaru
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-KAZ-ITA
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇨🇳 WANG Zijie
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Elmir ALIMZHANOV 🇰🇿 - 🇮🇹 Federico VISMARA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/BEL.ics b/docs/general/BEL.ics
index 15151e4e0..ae867acb8 100644
--- a/docs/general/BEL.ics
+++ b/docs/general/BEL.ics
@@ -338,13 +338,12 @@ SUMMARY:⛵ Men's Skiff - Race 3
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-HUN-BEL
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇧🇪 Neisser
-  LOYOLA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Gergely SIKLOSI 🇭🇺 - 🇧🇪 Neisser LOYOLA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index 5cb4f1acc..1b85705b8 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -1049,12 +1049,12 @@ SUMMARY:🛶 Women's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-CHN-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇨🇳 WANG Zijie
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 WANG Zijie 🇨🇳 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/DEN.ics b/docs/general/DEN.ics
index 775489ee9..a5dfb8712 100644
--- a/docs/general/DEN.ics
+++ b/docs/general/DEN.ics
@@ -666,12 +666,12 @@ SUMMARY:🏸 Viktor AXELSEN 🇩🇰 - 🇮🇱 Misha ZILBERMAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KOR-DEN
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇩🇰 Jonathan GROTH
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/HUN.ics b/docs/general/HUN.ics
index 790cdc2d4..113fe7640 100644
--- a/docs/general/HUN.ics
+++ b/docs/general/HUN.ics
@@ -473,6 +473,15 @@ SUMMARY:🤺 Tibor ANDRASFI 🇭🇺 - 🇻🇪 Grabiel LUGO
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-HUN-BEL
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Gergely SIKLOSI 🇭🇺 - 🇧🇪 Neisser LOYOLA
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T143000Z-judo-WOMEN-52-KG-REPECHAGE-CONTEST-ISR-HUN
 DTSTAMP:20240728T143000Z
 DTSTART:20240728T143000Z
diff --git a/docs/general/IND.ics b/docs/general/IND.ics
index 7993bbc1d..6d4933bc6 100644
--- a/docs/general/IND.ics
+++ b/docs/general/IND.ics
@@ -433,12 +433,12 @@ SUMMARY:🏹 Men's Team Quarterfinal
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-SGP-IND
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇮🇳 Sreeja AKULA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/ITA.ics b/docs/general/ITA.ics
index 4a4bf029d..91bfe94f4 100644
--- a/docs/general/ITA.ics
+++ b/docs/general/ITA.ics
@@ -1078,13 +1078,21 @@ SUMMARY:🛶 Women's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-ITA-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇮🇹 Federico
-  VISMARA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Davide di VEROLI 🇮🇹 - 🇯🇵 YAMADA Masaru
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-KAZ-ITA
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Elmir ALIMZHANOV 🇰🇿 - 🇮🇹 Federico VISMARA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 6fee55d7e..cc8faccda 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -981,12 +981,21 @@ SUMMARY:🛶 Women's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-CHN-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇯🇵 YAMADA Masaru
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 WANG Zijie 🇨🇳 - 🇯🇵 KANO Koki
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-ITA-JPN
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Davide di VEROLI 🇮🇹 - 🇯🇵 YAMADA Masaru
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/KAZ.ics b/docs/general/KAZ.ics
index c95e50e56..ff4a7a369 100644
--- a/docs/general/KAZ.ics
+++ b/docs/general/KAZ.ics
@@ -394,6 +394,15 @@ SUMMARY:🤺 Ruslan KURBANOV 🇰🇿 - 🇫🇷 Romain CANNONE
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-KAZ-ITA
+DTSTAMP:20240728T133000Z
+DTSTART:20240728T133000Z
+DTEND:20240728T135500Z
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Elmir ALIMZHANOV 🇰🇿 - 🇮🇹 Federico VISMARA
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T134600Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-32-KAZ-JOR
 DTSTAMP:20240728T134600Z
 DTSTART:20240728T134600Z
diff --git a/docs/general/KOR.ics b/docs/general/KOR.ics
index c5833d8cb..e34df44a8 100644
--- a/docs/general/KOR.ics
+++ b/docs/general/KOR.ics
@@ -716,6 +716,15 @@ SUMMARY:🏸 BAEK/LEE 🇰🇷 - 🇫🇷 LAMBERT/TRAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KOR-DEN
+DTSTAMP:20240729T200000Z
+DTSTART:20240729T200000Z
+DTEND:20240729T210000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T070000Z-shooting-TRAP-WOMENS-QUALIFICATION-DAY-1
 DTSTAMP:20240730T070000Z
 DTSTART:20240730T070000Z
diff --git a/docs/general/ROU.ics b/docs/general/ROU.ics
index 6d1e9226e..55f09768e 100644
--- a/docs/general/ROU.ics
+++ b/docs/general/ROU.ics
@@ -199,13 +199,12 @@ SUMMARY:🏓 KAO Cheng-Jui 🇹🇼 - 🇷🇴 Eduard IONESCU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇷🇴 Elizabeta
-  SAMARA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Elizabeta SAMARA 🇷🇴 - 🇹🇼 CHENG I-Ching
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/SGP.ics b/docs/general/SGP.ics
index 18a6fe8bf..0cc76e492 100644
--- a/docs/general/SGP.ics
+++ b/docs/general/SGP.ics
@@ -146,6 +146,15 @@ SUMMARY:🏸 HEE/TAN 🇸🇬 - 🇺🇸 CHIU/GAI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-SGP-IND
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T182000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-I-SGP-
 DTSTAMP:20240730T182000Z
 DTSTART:20240730T182000Z
diff --git a/docs/general/TPE.ics b/docs/general/TPE.ics
index 04338864b..be4a0b714 100644
--- a/docs/general/TPE.ics
+++ b/docs/general/TPE.ics
@@ -409,6 +409,15 @@ SUMMARY:🏓 KAO Cheng-Jui 🇹🇼 - 🇷🇴 Eduard IONESCU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Elizabeta SAMARA 🇷🇴 - 🇹🇼 CHENG I-Ching
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T190400Z-boxing-MENS-635KG-PRELIMINARIES-ROUND-OF-16-KAZ-TPE
 DTSTAMP:20240729T190400Z
 DTSTART:20240729T190400Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index a5c7fabc9..35137c233 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -6324,41 +6324,39 @@ SUMMARY:🛶 Women's Kayak Single Semifinal
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-CHN-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇯🇵 YAMADA Masaru
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 WANG Zijie 🇨🇳 - 🇯🇵 KANO Koki
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-HUN-BEL
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇧🇪 Neisser
-  LOYOLA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Gergely SIKLOSI 🇭🇺 - 🇧🇪 Neisser LOYOLA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-ITA-JPN
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇮🇹 Federico
-  VISMARA
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Davide di VEROLI 🇮🇹 - 🇯🇵 YAMADA Masaru
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16
+UID:20240728T133000Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-16-KAZ-ITA
 DTSTAMP:20240728T133000Z
 DTSTART:20240728T133000Z
 DTEND:20240728T135500Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 16\n🇨🇳 WANG Zijie
-SUMMARY:🤺 Men's Épée Individual Table of 16
+DESCRIPTION:Fencing - Men's Épée Individual Table of 16
+SUMMARY:🤺 Elmir ALIMZHANOV 🇰🇿 - 🇮🇹 Federico VISMARA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
@@ -10709,22 +10707,21 @@ SUMMARY:🏓 Omar ASSAR 🇪🇬 - 🇪🇨 Alberto MINO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇷🇴 Elizabeta
-  SAMARA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Elizabeta SAMARA 🇷🇴 - 🇹🇼 CHENG I-Ching
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-SGP-IND
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇮🇳 Sreeja AKULA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -10899,12 +10896,12 @@ SUMMARY:🏄 Men's Round 3 - Heat 6
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KOR-DEN
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇩🇰 Jonathan GROTH
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/DEN.ics b/docs/table-tennis/DEN.ics
index c9df09845..e743a2617 100644
--- a/docs/table-tennis/DEN.ics
+++ b/docs/table-tennis/DEN.ics
@@ -22,12 +22,12 @@ SUMMARY:🏓 Anders LIND 🇩🇰 - 🇵🇹 Marcos FREITAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KOR-DEN
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇩🇰 Jonathan GROTH
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/IND.ics b/docs/table-tennis/IND.ics
index 5c6038ff8..305bfc8ad 100644
--- a/docs/table-tennis/IND.ics
+++ b/docs/table-tennis/IND.ics
@@ -49,12 +49,12 @@ SUMMARY:🏓 Felix LEBRUN 🇫🇷 - 🇮🇳 Harmeet DESAI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-SGP-IND
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇮🇳 Sreeja AKULA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/KOR.ics b/docs/table-tennis/KOR.ics
index 5a4ee8d52..2bc15987f 100644
--- a/docs/table-tennis/KOR.ics
+++ b/docs/table-tennis/KOR.ics
@@ -57,4 +57,13 @@ DESCRIPTION:Table Tennis - Women's Singles Round of 64
 SUMMARY:🏓 SHIN Yubin 🇰🇷 - 🇦🇺 Melissa TAPPER
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KOR-DEN
+DTSTAMP:20240729T200000Z
+DTSTART:20240729T200000Z
+DTEND:20240729T210000Z
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/ROU.ics b/docs/table-tennis/ROU.ics
index 2c4aea1e0..063365e2a 100644
--- a/docs/table-tennis/ROU.ics
+++ b/docs/table-tennis/ROU.ics
@@ -67,13 +67,12 @@ SUMMARY:🏓 KAO Cheng-Jui 🇹🇼 - 🇷🇴 Eduard IONESCU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇷🇴 Elizabeta
-  SAMARA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Elizabeta SAMARA 🇷🇴 - 🇹🇼 CHENG I-Ching
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/SGP.ics b/docs/table-tennis/SGP.ics
index 48b0dae7e..5062401d7 100644
--- a/docs/table-tennis/SGP.ics
+++ b/docs/table-tennis/SGP.ics
@@ -30,4 +30,13 @@ DESCRIPTION:Table Tennis - Men's Singles Round of 64
 SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇸🇬 QUEK Izaac
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-SGP-IND
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/TPE.ics b/docs/table-tennis/TPE.ics
index 479e865d4..422553d13 100644
--- a/docs/table-tennis/TPE.ics
+++ b/docs/table-tennis/TPE.ics
@@ -66,4 +66,13 @@ DESCRIPTION:Table Tennis - Men's Singles Round of 32
 SUMMARY:🏓 KAO Cheng-Jui 🇹🇼 - 🇷🇴 Eduard IONESCU
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
+DTSTAMP:20240729T190000Z
+DTSTART:20240729T190000Z
+DTEND:20240729T200000Z
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Elizabeta SAMARA 🇷🇴 - 🇹🇼 CHENG I-Ching
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/general.ics b/docs/table-tennis/general.ics
index b077d192d..a4d59423b 100644
--- a/docs/table-tennis/general.ics
+++ b/docs/table-tennis/general.ics
@@ -824,31 +824,30 @@ SUMMARY:🏓 Omar ASSAR 🇪🇬 - 🇪🇨 Alberto MINO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇷🇴 Elizabeta
-  SAMARA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 Elizabeta SAMARA 🇷🇴 - 🇹🇼 CHENG I-Ching
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
+UID:20240729T190000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-SGP-IND
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
 DTEND:20240729T200000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇮🇳 Sreeja AKULA
-SUMMARY:🏓 Women's Singles Round of 32
+DESCRIPTION:Table Tennis - Women's Singles Round of 32
+SUMMARY:🏓 ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
+UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-KOR-DEN
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32\n🇩🇰 Jonathan GROTH
-SUMMARY:🏓 Men's Singles Round of 32
+DESCRIPTION:Table Tennis - Men's Singles Round of 32
+SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 91e3c6432..f380b5a54 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -5772,7 +5772,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GER,GBR,AUS,SUI,JPN,GBR,FRA,FRA,NZL,GER,IRL,NED,ITA,SWE,BEL,USA,AUS,SUI,CAN,JPN,IRL,SUI,BRA,CHN,AUT,BEL,ESP,IRL,SWE,CAN,FIN,FIN,NZL,BRA,MAR,POL,HUN,USA,DEN,CAN,ESP,RSA,NED,ECU,CZE,AUS,ECU,GER,POL,POR,CZE,CHN,ITA,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
+<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GER,GBR,AUS,SUI,GBR,JPN,GBR,FRA,FRA,NZL,GER,IRL,NED,USA,ITA,SWE,BEL,USA,AUS,SWE,SUI,CAN,JPN,IRL,SUI,BRA,CHN,AUT,BEL,ESP,IRL,SWE,CAN,FIN,FIN,NZL,BRA,MAR,POL,HUN,USA,DEN,CAN,ESP,RSA,NED,POL,ECU,CZE,AUS,ECU,GER,POL,POR,CZE,CHN,ITA,BRA,NZL,JPN,ITA,NED,FRA,BEL">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -5847,7 +5847,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="CAN,GER,AUS,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
+<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="SUI,SWE,IRL,USA,CAN,GER,AUS,POL,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -6838,7 +6838,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T100000Z" data-end="20240728T135000Z" data-noc="JPN,CHN,AUS,CHN,NED,CHN,ESP,ESP,BRA,RSA,BRA,AUS,BRA,USA,AUS,NED,FRA,JPN,USA,THA,JPN,USA">
+<div class="event py-4" data-start="20240728T100000Z" data-end="20240728T135000Z" data-noc="JPN,CHN,AUS,CHN,NED,CHN,ESP,ESP,BRA,RSA,BRA,AUS,USA,NED,AUS,BRA,FRA,JPN,USA,THA,JPN,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -8286,7 +8286,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T111500Z" data-end="20240728T115000Z" data-noc="POL,FRA,NED,BRA,SWE,NOR,AUS,ITA,CHN,GBR,USA,JPN,CZE,FIN,ESP,NZL,DEN,CAN,GER,BEL">
+<div class="event py-4" data-start="20240728T111500Z" data-end="20240728T115000Z" data-noc="NED,FRA,POL,GER,BRA,SWE,NOR,AUS,ITA,CHN,USA,JPN,CZE,FIN,ESP,GBR,NZL,BEL,CAN,DEN">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -8450,7 +8450,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T115500Z" data-end="20240728T123000Z" data-noc="AUS,BEL,BRA,CAN,CHN,CZE,DEN,ESP,FIN,FRA,GBR,GER,ITA,JPN,NED,NOR,NZL,POL,SWE,USA">
+<div class="event py-4" data-start="20240728T115500Z" data-end="20240728T123000Z" data-noc="NED,DEN,GBR,ITA,NOR,AUS,BEL,BRA,CAN,CHN,CZE,ESP,FIN,FRA,GER,JPN,NZL,POL,SWE,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -8656,7 +8656,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T121000Z" data-end="20240728T134000Z" data-noc="SUI,NED,FRA,FRA,USA,ITA,AUT,RSA,AUT,USA,SWE,GBR,AUS,NZL,UKR,EST,NED,DEN,POL,ITA,GER,SUI,DEN,CZE,POR,BEL,CAN,BRA,SLO,GBR,MEX,JPN,CHN,HUN,MRI,RWA">
+<div class="event py-4" data-start="20240728T121000Z" data-end="20240728T134000Z" data-noc="FRA,NED,FRA,AUT,SWE,SUI,ITA,NED,GBR,ITA,RSA,DEN,USA,NZL,USA,AUS,HUN,GBR,GER,EST,CAN,AUT,POR,BRA,DEN,BEL,UKR,POL,CHN,SLO,JPN,CZE,MEX,RWA,SUI,MRI">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -9033,7 +9033,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="JPN">
+<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="CHN,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -9041,12 +9041,11 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Épée Individual Table of 16
-<div class="competitor JPN">🇯🇵 YAMADA Masaru</div>
+   <div class="">WANG Zijie 🇨🇳 - 🇯🇵 KANO Koki
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="BEL">
+<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="HUN,BEL">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -9054,12 +9053,11 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Épée Individual Table of 16
-<div class="competitor BEL">🇧🇪 Neisser LOYOLA</div>
+   <div class="">Gergely SIKLOSI 🇭🇺 - 🇧🇪 Neisser LOYOLA
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="ITA">
+<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="ITA,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -9067,12 +9065,11 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Épée Individual Table of 16
-<div class="competitor ITA">🇮🇹 Federico VISMARA</div>
+   <div class="">Davide di VEROLI 🇮🇹 - 🇯🇵 YAMADA Masaru
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="CHN">
+<div class="event py-4" data-start="20240728T133000Z" data-end="20240728T135500Z" data-noc="KAZ,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -9080,8 +9077,7 @@
    FENCING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Épée Individual Table of 16
-<div class="competitor CHN">🇨🇳 WANG Zijie</div>
+   <div class="">Elmir ALIMZHANOV 🇰🇿 - 🇮🇹 Federico VISMARA
    </div>
  </div>
 </div>
@@ -15126,7 +15122,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T190000Z" data-end="20240729T200000Z" data-noc="ROU">
+<div class="event py-4" data-start="20240729T190000Z" data-end="20240729T200000Z" data-noc="ROU,TPE">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -15134,12 +15130,11 @@
    TABLE TENNIS
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Singles Round of 32
-<div class="competitor ROU">🇷🇴 Elizabeta SAMARA</div>
+   <div class="">Elizabeta SAMARA 🇷🇴 - 🇹🇼 CHENG I-Ching
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T190000Z" data-end="20240729T200000Z" data-noc="IND">
+<div class="event py-4" data-start="20240729T190000Z" data-end="20240729T200000Z" data-noc="SGP,IND">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -15147,8 +15142,7 @@
    TABLE TENNIS
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Women's Singles Round of 32
-<div class="competitor IND">🇮🇳 Sreeja AKULA</div>
+   <div class="">ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
    </div>
  </div>
 </div>
@@ -15380,7 +15374,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="DEN">
+<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="KOR,DEN">
  <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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -15388,8 +15382,7 @@
    TABLE TENNIS
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's Singles Round of 32
-<div class="competitor DEN">🇩🇰 Jonathan GROTH</div>
+   <div class="">JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
    </div>
  </div>
 </div>