diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index de9f545b9..ff10bca4a 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -1560,6 +1560,15 @@ SUMMARY:⛵ Women's Windsurfing - Race 7
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-CHN-KOR
+DTSTAMP:20240729T150000Z
+DTSTART:20240729T150000Z
+DTEND:20240729T160000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T150000Z-volleyball-WOMENS-PRELIMINARY-ROUND-POOL-A-USA-CHN
 DTSTAMP:20240729T150000Z
 DTSTART:20240729T150000Z
@@ -1637,15 +1646,6 @@ SUMMARY:🤽 CHN 🇨🇳 - 🇳🇱 NED
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CHN-LUX
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32
-SUMMARY:🏓 SUN Yingsha 🇨🇳 - 🇱🇺 Xia Lian NI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T191000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-A-CHN-MA
 DTSTAMP:20240729T191000Z
 DTSTART:20240729T191000Z
diff --git a/docs/general/HKG.ics b/docs/general/HKG.ics
index 97f3741c8..a5cfa431b 100644
--- a/docs/general/HKG.ics
+++ b/docs/general/HKG.ics
@@ -424,6 +424,15 @@ SUMMARY:⛵ Men's Skiff - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-HKG-PRK
+DTSTAMP:20240729T140000Z
+DTSTART:20240729T140000Z
+DTEND:20240729T150000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WONG/DOO 🇭🇰 - 🇰🇵 RI/KIM
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T140100Z-sailing-MENS-WINDSURFING-RACE-5
 DTSTAMP:20240729T140100Z
 DTSTART:20240729T140100Z
diff --git a/docs/general/IND.ics b/docs/general/IND.ics
index 80475ab99..b109c587a 100644
--- a/docs/general/IND.ics
+++ b/docs/general/IND.ics
@@ -442,15 +442,6 @@ SUMMARY:🏓 Prithika PAVADE 🇫🇷 - 🇮🇳 Manika BATRA
 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
-BEGIN:VEVENT
 UID:20240730T070000Z-shooting-TRAP-WOMENS-QUALIFICATION-DAY-1
 DTSTAMP:20240730T070000Z
 DTSTART:20240730T070000Z
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 3c9cb5723..afca57915 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1467,15 +1467,6 @@ SUMMARY:🏀 USA 🇺🇸 - 🇯🇵 JPN
 LOCATION:Pierre Mauroy Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-JPN
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/general/KOR.ics b/docs/general/KOR.ics
index fddec2302..a238a614d 100644
--- a/docs/general/KOR.ics
+++ b/docs/general/KOR.ics
@@ -734,12 +734,12 @@ SUMMARY:🏸 BAEK/LEE 🇰🇷 - 🇫🇷 LAMBERT/TRAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
-DTSTAMP:20240729T140000Z
-DTSTART:20240729T140000Z
-DTEND:20240729T150000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇷 LIM/SHIN
-SUMMARY:🏓 Mixed Doubles Semifinal
+UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-CHN-KOR
+DTSTAMP:20240729T150000Z
+DTSTART:20240729T150000Z
+DTEND:20240729T160000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/LUX.ics b/docs/general/LUX.ics
index aa11817e1..3f271fb0b 100644
--- a/docs/general/LUX.ics
+++ b/docs/general/LUX.ics
@@ -69,15 +69,6 @@ SUMMARY:🏓 Sibel ALTINKAYA 🇹🇷 - 🇱🇺 Xia Lian NI
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CHN-LUX
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32
-SUMMARY:🏓 SUN Yingsha 🇨🇳 - 🇱🇺 Xia Lian NI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240801T144800Z-archery-MENS-INDIVIDUAL-132-ELIMINATION-ROUND-COL-LUX
 DTSTAMP:20240801T144800Z
 DTSTART:20240801T144800Z
diff --git a/docs/general/POR.ics b/docs/general/POR.ics
index 4348a6ce6..95fa56fd5 100644
--- a/docs/general/POR.ics
+++ b/docs/general/POR.ics
@@ -248,15 +248,6 @@ SUMMARY:🏓 Anders LIND 🇩🇰 - 🇵🇹 Marcos FREITAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇵🇹 Fu YU
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
diff --git a/docs/general/PRK.ics b/docs/general/PRK.ics
index 562188218..39bf80b13 100644
--- a/docs/general/PRK.ics
+++ b/docs/general/PRK.ics
@@ -40,12 +40,12 @@ SUMMARY:🏓 KARLSSON/KALLBERG 🇸🇪 - 🇰🇵 RI/KIM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
-DTSTAMP:20240729T150000Z
-DTSTART:20240729T150000Z
-DTEND:20240729T160000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇵 RI/KIM
-SUMMARY:🏓 Mixed Doubles Semifinal
+UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-HKG-PRK
+DTSTAMP:20240729T140000Z
+DTSTART:20240729T140000Z
+DTEND:20240729T150000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WONG/DOO 🇭🇰 - 🇰🇵 RI/KIM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -58,16 +58,6 @@ SUMMARY:🥊 WON Ungyong 🇰🇵 - 🇳🇱 Chelsey HEIJNEN
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇰🇵 PYON Song
-  Gyong
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T145000Z-boxing-WOMENS-54KG-PRELIMINARIES-ROUND-OF-16-UZB-PRK
 DTSTAMP:20240730T145000Z
 DTSTART:20240730T145000Z
diff --git a/docs/general/SGP.ics b/docs/general/SGP.ics
index 0cc76e492..18a6fe8bf 100644
--- a/docs/general/SGP.ics
+++ b/docs/general/SGP.ics
@@ -146,15 +146,6 @@ 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/SLO.ics b/docs/general/SLO.ics
index 80859c6f4..7bd4403e9 100644
--- a/docs/general/SLO.ics
+++ b/docs/general/SLO.ics
@@ -457,15 +457,6 @@ SUMMARY:⛵ Women's Windsurfing - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-JPN
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T070000Z-handball-WOMENS-PRELIMINARY-ROUND-GROUP-A-GER-SLO
 DTSTAMP:20240730T070000Z
 DTSTART:20240730T070000Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index dc368f96c..89b96af0b 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -10237,12 +10237,12 @@ SUMMARY:🏉 CAN 🇨🇦 - 🇨🇳 CHN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
+UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-HKG-PRK
 DTSTAMP:20240729T140000Z
 DTSTART:20240729T140000Z
 DTEND:20240729T150000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇷 LIM/SHIN
-SUMMARY:🏓 Mixed Doubles Semifinal
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WONG/DOO 🇭🇰 - 🇰🇵 RI/KIM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -10528,12 +10528,12 @@ SUMMARY:🛹 Men's Street Final
 LOCATION:La Concorde 3
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
+UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-CHN-KOR
 DTSTAMP:20240729T150000Z
 DTSTART:20240729T150000Z
 DTEND:20240729T160000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇵 RI/KIM
-SUMMARY:🏓 Mixed Doubles Semifinal
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -10885,15 +10885,6 @@ SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-MENS-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T220000Z
-DESCRIPTION:Table Tennis - Men's & Women's Singles Round of 32
-SUMMARY:🏓 Men's & Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
@@ -10903,24 +10894,6 @@ SUMMARY:🏓 Women's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇵🇹 Fu YU
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CHN-LUX
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32
-SUMMARY:🏓 SUN Yingsha 🇨🇳 - 🇱🇺 Xia Lian NI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
@@ -11146,15 +11119,6 @@ SUMMARY:🏓 Prithika PAVADE 🇫🇷 - 🇮🇳 Manika BATRA
 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
-BEGIN:VEVENT
 UID:20240729T190000Z-volleyball-WOMENS-PRELIMINARY-ROUND-POOL-A-FRA-SRB
 DTSTAMP:20240729T190000Z
 DTSTART:20240729T190000Z
@@ -11344,15 +11308,6 @@ SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-JPN
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
@@ -11362,16 +11317,6 @@ SUMMARY:🏓 Women's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇰🇵 PYON Song
-  Gyong
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-PUR-USA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
diff --git a/docs/table-tennis/CHN.ics b/docs/table-tennis/CHN.ics
index b6dc34bc5..cc7b5e6a5 100644
--- a/docs/table-tennis/CHN.ics
+++ b/docs/table-tennis/CHN.ics
@@ -58,12 +58,12 @@ SUMMARY:🏓 Lynda LOGHRAIBI 🇩🇿 - 🇨🇳 CHEN Meng
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CHN-LUX
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32
-SUMMARY:🏓 SUN Yingsha 🇨🇳 - 🇱🇺 Xia Lian NI
+UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-CHN-KOR
+DTSTAMP:20240729T150000Z
+DTSTART:20240729T150000Z
+DTEND:20240729T160000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/HKG.ics b/docs/table-tennis/HKG.ics
index b3ceadb5b..db5053f34 100644
--- a/docs/table-tennis/HKG.ics
+++ b/docs/table-tennis/HKG.ics
@@ -49,6 +49,15 @@ SUMMARY:🏓 CHIEN Tung-Chuan 🇹🇼 - 🇭🇰 ZHU Chengzhu
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-HKG-PRK
+DTSTAMP:20240729T140000Z
+DTSTART:20240729T140000Z
+DTEND:20240729T150000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WONG/DOO 🇭🇰 - 🇰🇵 RI/KIM
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T080000Z-table-tennis-WOMENS-TEAM-ROUND-OF-16-HKG-SWE
 DTSTAMP:20240806T080000Z
 DTSTART:20240806T080000Z
diff --git a/docs/table-tennis/IND.ics b/docs/table-tennis/IND.ics
index 4775716fc..26f218d86 100644
--- a/docs/table-tennis/IND.ics
+++ b/docs/table-tennis/IND.ics
@@ -58,15 +58,6 @@ SUMMARY:🏓 Prithika PAVADE 🇫🇷 - 🇮🇳 Manika BATRA
 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
-BEGIN:VEVENT
 UID:20240805T180000Z-table-tennis-WOMENS-TEAM-ROUND-OF-16-ROU-IND
 DTSTAMP:20240805T180000Z
 DTSTART:20240805T180000Z
diff --git a/docs/table-tennis/JPN.ics b/docs/table-tennis/JPN.ics
index 4e37ae737..2eafd0d69 100644
--- a/docs/table-tennis/JPN.ics
+++ b/docs/table-tennis/JPN.ics
@@ -49,15 +49,6 @@ SUMMARY:🏓 Giorgia PICCOLIN 🇮🇹 - 🇯🇵 Miu HIRANO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-JPN
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240730T080000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240730T080000Z
 DTSTART:20240730T080000Z
diff --git a/docs/table-tennis/KOR.ics b/docs/table-tennis/KOR.ics
index 1f8a18702..013beae14 100644
--- a/docs/table-tennis/KOR.ics
+++ b/docs/table-tennis/KOR.ics
@@ -58,12 +58,12 @@ SUMMARY:🏓 SHIN Yubin 🇰🇷 - 🇦🇺 Melissa TAPPER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
-DTSTAMP:20240729T140000Z
-DTSTART:20240729T140000Z
-DTEND:20240729T150000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇷 LIM/SHIN
-SUMMARY:🏓 Mixed Doubles Semifinal
+UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-CHN-KOR
+DTSTAMP:20240729T150000Z
+DTSTART:20240729T150000Z
+DTEND:20240729T160000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/table-tennis/LUX.ics b/docs/table-tennis/LUX.ics
index 09e2a14c3..64142f595 100644
--- a/docs/table-tennis/LUX.ics
+++ b/docs/table-tennis/LUX.ics
@@ -30,13 +30,4 @@ DESCRIPTION:Table Tennis - Women's Singles Round of 64
 SUMMARY:🏓 Sibel ALTINKAYA 🇹🇷 - 🇱🇺 Xia Lian NI
 LOCATION:South Paris Arena 4
 END:VEVENT
-BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CHN-LUX
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32
-SUMMARY:🏓 SUN Yingsha 🇨🇳 - 🇱🇺 Xia Lian NI
-LOCATION:South Paris Arena 4
-END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/POR.ics b/docs/table-tennis/POR.ics
index 51b64bb0b..f87669bde 100644
--- a/docs/table-tennis/POR.ics
+++ b/docs/table-tennis/POR.ics
@@ -40,15 +40,6 @@ SUMMARY:🏓 Anders LIND 🇩🇰 - 🇵🇹 Marcos FREITAS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇵🇹 Fu YU
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
diff --git a/docs/table-tennis/PRK.ics b/docs/table-tennis/PRK.ics
index ab733ddf2..a6a9f4b7e 100644
--- a/docs/table-tennis/PRK.ics
+++ b/docs/table-tennis/PRK.ics
@@ -31,22 +31,12 @@ SUMMARY:🏓 KARLSSON/KALLBERG 🇸🇪 - 🇰🇵 RI/KIM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
-DTSTAMP:20240729T150000Z
-DTSTART:20240729T150000Z
-DTEND:20240729T160000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇵 RI/KIM
-SUMMARY:🏓 Mixed Doubles Semifinal
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇰🇵 PYON Song
-  Gyong
-SUMMARY:🏓 Women's Singles Round of 32
+UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-HKG-PRK
+DTSTAMP:20240729T140000Z
+DTSTART:20240729T140000Z
+DTEND:20240729T150000Z
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WONG/DOO 🇭🇰 - 🇰🇵 RI/KIM
 LOCATION:South Paris Arena 4
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/table-tennis/SGP.ics b/docs/table-tennis/SGP.ics
index 5062401d7..48b0dae7e 100644
--- a/docs/table-tennis/SGP.ics
+++ b/docs/table-tennis/SGP.ics
@@ -30,13 +30,4 @@ 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/SLO.ics b/docs/table-tennis/SLO.ics
index c17bed3ff..f5a3b24ea 100644
--- a/docs/table-tennis/SLO.ics
+++ b/docs/table-tennis/SLO.ics
@@ -22,15 +22,6 @@ SUMMARY:🏓 Darko JORGIC 🇸🇮 - 🇸🇬 QUEK Izaac
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-JPN
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240731T080000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240731T080000Z
 DTSTART:20240731T080000Z
diff --git a/docs/table-tennis/general.ics b/docs/table-tennis/general.ics
index 406cfb76d..6dcdf1cae 100644
--- a/docs/table-tennis/general.ics
+++ b/docs/table-tennis/general.ics
@@ -742,21 +742,21 @@ SUMMARY:🏓 Giorgia PICCOLIN 🇮🇹 - 🇯🇵 Miu HIRANO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
+UID:20240729T140000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-HKG-PRK
 DTSTAMP:20240729T140000Z
 DTSTART:20240729T140000Z
 DTEND:20240729T150000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇷 LIM/SHIN
-SUMMARY:🏓 Mixed Doubles Semifinal
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WONG/DOO 🇭🇰 - 🇰🇵 RI/KIM
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
+UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL-CHN-KOR
 DTSTAMP:20240729T150000Z
 DTSTART:20240729T150000Z
 DTEND:20240729T160000Z
-DESCRIPTION:Table Tennis - Mixed Doubles Semifinal\n🇰🇵 RI/KIM
-SUMMARY:🏓 Mixed Doubles Semifinal
+DESCRIPTION:Table Tennis - Mixed Doubles Semifinal
+SUMMARY:🏓 WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -779,15 +779,6 @@ SUMMARY:🏓 Men's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-MENS-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T220000Z
-DESCRIPTION:Table Tennis - Men's & Women's Singles Round of 32
-SUMMARY:🏓 Men's & Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
@@ -797,24 +788,6 @@ SUMMARY:🏓 Women's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇵🇹 Fu YU
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-CHN-LUX
-DTSTAMP:20240729T180000Z
-DTSTART:20240729T180000Z
-DTEND:20240729T190000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32
-SUMMARY:🏓 SUN Yingsha 🇨🇳 - 🇱🇺 Xia Lian NI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T180000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-ROU-TPE
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
@@ -860,15 +833,6 @@ SUMMARY:🏓 Prithika PAVADE 🇫🇷 - 🇮🇳 Manika BATRA
 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
-BEGIN:VEVENT
 UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
@@ -887,15 +851,6 @@ SUMMARY:🏓 JANG Woojin 🇰🇷 - 🇩🇰 Jonathan GROTH
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-MENS-SINGLES-ROUND-OF-32-SLO-JPN
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Men's Singles Round of 32
-SUMMARY:🏓 Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
@@ -905,16 +860,6 @@ SUMMARY:🏓 Women's Singles Round of 32
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32
-DTSTAMP:20240729T200000Z
-DTSTART:20240729T200000Z
-DTEND:20240729T210000Z
-DESCRIPTION:Table Tennis - Women's Singles Round of 32\n🇰🇵 PYON Song
-  Gyong
-SUMMARY:🏓 Women's Singles Round of 32
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T200000Z-table-tennis-WOMENS-SINGLES-ROUND-OF-32-PUR-USA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
diff --git a/docs/today.html b/docs/today.html
index e84b92f71..5168bb737 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -10077,7 +10077,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T154500Z" data-end="20240728T162900Z" data-noc="AUS,GBR,BRA,ITA,FRA,SLO,NZL,SVK,AUT,ESP,POL,GER">
+<div class="event py-4" data-start="20240728T154500Z" data-end="20240728T162900Z" data-noc="AUS,POL,GBR,BRA,ITA,FRA,SLO,NZL,SVK,AUT,GER,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -14406,15 +14406,14 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T140000Z" data-end="20240729T150000Z" data-noc="KOR">
+<div class="event py-4" data-start="20240729T140000Z" data-end="20240729T150000Z" data-noc="HKG,PRK">
  <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">
    
    TABLE TENNIS
    </div>
-   <div class="">Mixed Doubles Semifinal
-<div class="competitor KOR">🇰🇷 LIM/SHIN</div>
+   <div class="">WONG/DOO 🇭🇰 - 🇰🇵 RI/KIM
    </div>
  </div>
 </div>
@@ -14850,15 +14849,14 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T150000Z" data-end="20240729T160000Z" data-noc="PRK">
+<div class="event py-4" data-start="20240729T150000Z" data-end="20240729T160000Z" data-noc="CHN,KOR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
    
    TABLE TENNIS
    </div>
-   <div class="">Mixed Doubles Semifinal
-<div class="competitor PRK">🇰🇵 RI/KIM</div>
+   <div class="">WANG/SUN 🇨🇳 - 🇰🇷 LIM/SHIN
    </div>
  </div>
 </div>
@@ -15366,17 +15364,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T180000Z" data-end="20240729T220000Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   TABLE TENNIS
-   </div>
-   <div class="">Men's & Women's Singles Round of 32
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="NED">
  <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">
@@ -15390,31 +15377,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="POR">
- <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">
-   
-   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 POR">🇵🇹 Fu YU</div>
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" data-noc="CHN,LUX">
- <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">
-   
-   TABLE TENNIS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">SUN Yingsha 🇨🇳 - 🇱🇺 Xia Lian NI
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T180000Z" data-end="20240729T190000Z" 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">
@@ -15714,18 +15676,6 @@
    </div>
  </div>
 </div>
-<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">
-   
-   TABLE TENNIS
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">ZENG Jian 🇸🇬 - 🇮🇳 Sreeja AKULA
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T190000Z" data-end="20240729T211500Z" data-noc="FRA,SRB">
  <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">
@@ -15979,18 +15929,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="SLO,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">
-   
-   TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Deni KOZUL 🇸🇮 - 🇯🇵 Shunsuke TOGAMI
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="POR">
  <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">
@@ -16004,19 +15942,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="PRK">
- <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">
-   
-   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 PRK">🇰🇵 PYON Song Gyong</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T200000Z" data-end="20240729T210000Z" data-noc="PUR,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">