diff --git a/docs/en/general/CHN.ics b/docs/en/general/CHN.ics
index 8629db940..44d460f7b 100644
--- a/docs/en/general/CHN.ics
+++ b/docs/en/general/CHN.ics
@@ -3784,13 +3784,12 @@ SUMMARY: FENG Panfeng 🇨🇳 - 🇮🇪 Colin JUDGE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-VEN-CHN
 DTSTAMP:20240902T114500Z
 DTSTART:20240902T114500Z
 DTEND:20240902T123000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇨🇳
-  ZHAI Xiang
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Roberto QUIJADA 🇻🇪 - 🇨🇳 ZHAI Xiang
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/CZE.ics b/docs/en/general/CZE.ics
index 081ea22f6..c028d8fd3 100644
--- a/docs/en/general/CZE.ics
+++ b/docs/en/general/CZE.ics
@@ -448,13 +448,12 @@ SUMMARY:Women's Javelin Throw - F56 Qualification
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16
+UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16-CZE-POL
 DTSTAMP:20240902T093000Z
 DTSTART:20240902T093000Z
 DTEND:20240902T101500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16\n🇨🇿
-  Jiri SUCHANEK
-SUMMARY:Men's Singles - MS2 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16
+SUMMARY: Jiri SUCHANEK 🇨🇿 - 🇵🇱 Tomasz JAKIMCZUK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/ESP.ics b/docs/en/general/ESP.ics
index 72d0b8ce0..3c7c0fabb 100644
--- a/docs/en/general/ESP.ics
+++ b/docs/en/general/ESP.ics
@@ -1746,6 +1746,15 @@ SUMMARY: Alvaro VALERA 🇪🇸 - 🇨🇳 HUANG Jiaxin
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-ESP-GER
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Eder RODRIGUEZ 🇪🇸 - 🇩🇪 Thomas BRUECHLE
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-ESP-KOR
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
diff --git a/docs/en/general/GER.ics b/docs/en/general/GER.ics
index 685548918..f874225f1 100644
--- a/docs/en/general/GER.ics
+++ b/docs/en/general/GER.ics
@@ -1406,13 +1406,12 @@ SUMMARY:Women's PTS4
 LOCATION:Pont Alexandre III
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-ESP-GER
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
 DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇩🇪
-  Thomas BRUECHLE
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Eder RODRIGUEZ 🇪🇸 - 🇩🇪 Thomas BRUECHLE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/KOR.ics b/docs/en/general/KOR.ics
index 473fa9a2d..b6f9d7164 100644
--- a/docs/en/general/KOR.ics
+++ b/docs/en/general/KOR.ics
@@ -1389,13 +1389,12 @@ SUMMARY:Men's Shot Put - F41 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-KOR-POL
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
 DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇰🇷
-  JANG Yeongjin
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: JANG Yeongjin 🇰🇷 - 🇵🇱 Maciej NALEPKA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/POL.ics b/docs/en/general/POL.ics
index ce887a6ae..3157c008a 100644
--- a/docs/en/general/POL.ics
+++ b/docs/en/general/POL.ics
@@ -953,6 +953,15 @@ SUMMARY:Men's 200m Freestyle - S2 Heats
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16-CZE-POL
+DTSTAMP:20240902T093000Z
+DTSTART:20240902T093000Z
+DTEND:20240902T101500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16
+SUMMARY: Jiri SUCHANEK 🇨🇿 - 🇵🇱 Tomasz JAKIMCZUK
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T100000Z-para-triathlon-MENS-PTVI
 DTSTAMP:20240902T100000Z
 DTSTART:20240902T100000Z
@@ -987,6 +996,15 @@ SUMMARY:Women's PTS5
 LOCATION:Pont Alexandre III
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-KOR-POL
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: JANG Yeongjin 🇰🇷 - 🇵🇱 Maciej NALEPKA
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
diff --git a/docs/en/general/VEN.ics b/docs/en/general/VEN.ics
index efafe0031..4a43d61b8 100644
--- a/docs/en/general/VEN.ics
+++ b/docs/en/general/VEN.ics
@@ -188,6 +188,15 @@ SUMMARY:Women's 100m - T11 Round 1
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-VEN-CHN
+DTSTAMP:20240902T114500Z
+DTSTART:20240902T114500Z
+DTEND:20240902T123000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Roberto QUIJADA 🇻🇪 - 🇨🇳 ZHAI Xiang
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T182000Z-para-athletics-WOMENS-400M-T20-ROUND-1
 DTSTAMP:20240902T182000Z
 DTSTART:20240902T182000Z
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index ce44b0ed0..15bc9b893 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -13354,13 +13354,12 @@ SUMMARY: Fabien LAMIRAULT 🇫🇷 - 🇪🇸 Miguel Angel TOLEDO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16
+UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16-CZE-POL
 DTSTAMP:20240902T093000Z
 DTSTART:20240902T093000Z
 DTEND:20240902T101500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16\n🇨🇿
-  Jiri SUCHANEK
-SUMMARY:Men's Singles - MS2 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16
+SUMMARY: Jiri SUCHANEK 🇨🇿 - 🇵🇱 Tomasz JAKIMCZUK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -13816,6 +13815,15 @@ SUMMARY: Alvaro VALERA 🇪🇸 - 🇨🇳 HUANG Jiaxin
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-ESP-GER
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Eder RODRIGUEZ 🇪🇸 - 🇩🇪 Thomas BRUECHLE
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS6-ROUND-OF-16-USA-GBR
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
@@ -13825,6 +13833,15 @@ SUMMARY: Ian SEIDENFELD 🇺🇸 - 🇬🇧 Martin PERRY
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-KOR-POL
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: JANG Yeongjin 🇰🇷 - 🇵🇱 Maciej NALEPKA
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-USA
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
@@ -13843,26 +13860,6 @@ SUMMARY: Thiago GOMES 🇧🇷 - 🇪🇬 Abdelrahman ABDALLA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T110000Z
-DTSTART:20240902T110000Z
-DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇩🇪
-  Thomas BRUECHLE
-SUMMARY:Men's Singles - MS3 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T110000Z
-DTSTART:20240902T110000Z
-DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇰🇷
-  JANG Yeongjin
-SUMMARY:Men's Singles - MS3 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T110000Z-shooting-para-sport-P3-MIXED-25M-PISTOL-SH1-QUALIFICAT
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
@@ -13936,6 +13933,15 @@ SUMMARY: LEUNG Chung Yan 🇭🇰 - 🇭🇺 Peter PALOS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-VEN-CHN
+DTSTAMP:20240902T114500Z
+DTSTART:20240902T114500Z
+DTEND:20240902T123000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Roberto QUIJADA 🇻🇪 - 🇨🇳 ZHAI Xiang
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS6-ROUND-OF-16-AUS-ITA
 DTSTAMP:20240902T114500Z
 DTSTART:20240902T114500Z
@@ -13954,16 +13960,6 @@ SUMMARY: Yuttajak GLINBANCHEUN 🇹🇭 - 🇦🇷 Gabriel COPOLA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T114500Z
-DTSTART:20240902T114500Z
-DTEND:20240902T123000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇨🇳
-  ZHAI Xiang
-SUMMARY:Men's Singles - MS3 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T114500Z-wheelchair-basketball-WOMENS-PRELIMINARY-ROUND-GROUP-B
 DTSTAMP:20240902T114500Z
 DTSTART:20240902T114500Z
diff --git a/docs/en/para-table-tennis/CHN.ics b/docs/en/para-table-tennis/CHN.ics
index 6615bbc51..ed174eaa9 100644
--- a/docs/en/para-table-tennis/CHN.ics
+++ b/docs/en/para-table-tennis/CHN.ics
@@ -554,13 +554,12 @@ SUMMARY: FENG Panfeng 🇨🇳 - 🇮🇪 Colin JUDGE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-VEN-CHN
 DTSTAMP:20240902T114500Z
 DTSTART:20240902T114500Z
 DTEND:20240902T123000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇨🇳
-  ZHAI Xiang
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Roberto QUIJADA 🇻🇪 - 🇨🇳 ZHAI Xiang
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/CZE.ics b/docs/en/para-table-tennis/CZE.ics
index b435d3eeb..194ede796 100644
--- a/docs/en/para-table-tennis/CZE.ics
+++ b/docs/en/para-table-tennis/CZE.ics
@@ -22,13 +22,12 @@ SUMMARY: Petr SVATOS 🇨🇿 - 🇻🇪 Roberto QUIJADA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16
+UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16-CZE-POL
 DTSTAMP:20240902T093000Z
 DTSTART:20240902T093000Z
 DTEND:20240902T101500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16\n🇨🇿
-  Jiri SUCHANEK
-SUMMARY:Men's Singles - MS2 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16
+SUMMARY: Jiri SUCHANEK 🇨🇿 - 🇵🇱 Tomasz JAKIMCZUK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/ESP.ics b/docs/en/para-table-tennis/ESP.ics
index 517a88368..6ca21f837 100644
--- a/docs/en/para-table-tennis/ESP.ics
+++ b/docs/en/para-table-tennis/ESP.ics
@@ -103,6 +103,15 @@ SUMMARY: Alvaro VALERA 🇪🇸 - 🇨🇳 HUANG Jiaxin
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-ESP-GER
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Eder RODRIGUEZ 🇪🇸 - 🇩🇪 Thomas BRUECHLE
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T171500Z-para-table-tennis-MENS-SINGLES-MS4-ROUND-OF-16-ESP-KOR
 DTSTAMP:20240902T171500Z
 DTSTART:20240902T171500Z
diff --git a/docs/en/para-table-tennis/GER.ics b/docs/en/para-table-tennis/GER.ics
index bc7b7ba1b..1874bdf82 100644
--- a/docs/en/para-table-tennis/GER.ics
+++ b/docs/en/para-table-tennis/GER.ics
@@ -148,13 +148,12 @@ SUMMARY: CHEN Chao 🇨🇳 - 🇩🇪 Thomas RAU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-ESP-GER
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
 DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇩🇪
-  Thomas BRUECHLE
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Eder RODRIGUEZ 🇪🇸 - 🇩🇪 Thomas BRUECHLE
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/KOR.ics b/docs/en/para-table-tennis/KOR.ics
index 119288c5e..fedeeac38 100644
--- a/docs/en/para-table-tennis/KOR.ics
+++ b/docs/en/para-table-tennis/KOR.ics
@@ -202,13 +202,12 @@ SUMMARY: CHA Soo Yong 🇰🇷 - 🇹🇭 Thirayu CHUEAWONG
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-KOR-POL
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
 DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇰🇷
-  JANG Yeongjin
-SUMMARY:Men's Singles - MS3 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: JANG Yeongjin 🇰🇷 - 🇵🇱 Maciej NALEPKA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-table-tennis/POL.ics b/docs/en/para-table-tennis/POL.ics
index 2d586139d..12a7d36e7 100644
--- a/docs/en/para-table-tennis/POL.ics
+++ b/docs/en/para-table-tennis/POL.ics
@@ -184,6 +184,15 @@ SUMMARY: JIN Yucheng 🇨🇳 - 🇵🇱 Katarzyna MARSZAL
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16-CZE-POL
+DTSTAMP:20240902T093000Z
+DTSTART:20240902T093000Z
+DTEND:20240902T101500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16
+SUMMARY: Jiri SUCHANEK 🇨🇿 - 🇵🇱 Tomasz JAKIMCZUK
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T101500Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16-FRA-POL
 DTSTAMP:20240902T101500Z
 DTSTART:20240902T101500Z
@@ -193,6 +202,15 @@ SUMMARY: Julien MICHAUD 🇫🇷 - 🇵🇱 Rafal CZUPER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-KOR-POL
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: JANG Yeongjin 🇰🇷 - 🇵🇱 Maciej NALEPKA
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS10-QUARTERFINAL-1
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
diff --git a/docs/en/para-table-tennis/VEN.ics b/docs/en/para-table-tennis/VEN.ics
index 89d8f7038..bddc90a48 100644
--- a/docs/en/para-table-tennis/VEN.ics
+++ b/docs/en/para-table-tennis/VEN.ics
@@ -12,4 +12,13 @@ DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 32
 SUMMARY: Petr SVATOS 🇨🇿 - 🇻🇪 Roberto QUIJADA
 LOCATION:South Paris Arena 4
 END:VEVENT
+BEGIN:VEVENT
+UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-VEN-CHN
+DTSTAMP:20240902T114500Z
+DTSTART:20240902T114500Z
+DTEND:20240902T123000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Roberto QUIJADA 🇻🇪 - 🇨🇳 ZHAI Xiang
+LOCATION:South Paris Arena 4
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-table-tennis/general.ics b/docs/en/para-table-tennis/general.ics
index f36205150..cf5986176 100644
--- a/docs/en/para-table-tennis/general.ics
+++ b/docs/en/para-table-tennis/general.ics
@@ -1610,13 +1610,12 @@ SUMMARY: Fabien LAMIRAULT 🇫🇷 - 🇪🇸 Miguel Angel TOLEDO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16
+UID:20240902T093000Z-para-table-tennis-MENS-SINGLES-MS2-ROUND-OF-16-CZE-POL
 DTSTAMP:20240902T093000Z
 DTSTART:20240902T093000Z
 DTEND:20240902T101500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16\n🇨🇿
-  Jiri SUCHANEK
-SUMMARY:Men's Singles - MS2 - Round of 16
+DESCRIPTION:Para Table Tennis - Men's Singles - MS2 - Round of 16
+SUMMARY: Jiri SUCHANEK 🇨🇿 - 🇵🇱 Tomasz JAKIMCZUK
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
@@ -1683,6 +1682,15 @@ SUMMARY: Alvaro VALERA 🇪🇸 - 🇨🇳 HUANG Jiaxin
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-ESP-GER
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Eder RODRIGUEZ 🇪🇸 - 🇩🇪 Thomas BRUECHLE
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS6-ROUND-OF-16-USA-GBR
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
@@ -1692,6 +1700,15 @@ SUMMARY: Ian SEIDENFELD 🇺🇸 - 🇬🇧 Martin PERRY
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-KOR-POL
+DTSTAMP:20240902T110000Z
+DTSTART:20240902T110000Z
+DTEND:20240902T114500Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: JANG Yeongjin 🇰🇷 - 🇵🇱 Maciej NALEPKA
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-FRA-USA
 DTSTAMP:20240902T110000Z
 DTSTART:20240902T110000Z
@@ -1710,26 +1727,6 @@ SUMMARY: Thiago GOMES 🇧🇷 - 🇪🇬 Abdelrahman ABDALLA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T110000Z
-DTSTART:20240902T110000Z
-DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇩🇪
-  Thomas BRUECHLE
-SUMMARY:Men's Singles - MS3 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
-UID:20240902T110000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T110000Z
-DTSTART:20240902T110000Z
-DTEND:20240902T114500Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇰🇷
-  JANG Yeongjin
-SUMMARY:Men's Singles - MS3 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-CHN-IRL
 DTSTAMP:20240902T114500Z
 DTSTART:20240902T114500Z
@@ -1757,6 +1754,15 @@ SUMMARY: LEUNG Chung Yan 🇭🇰 - 🇭🇺 Peter PALOS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-VEN-CHN
+DTSTAMP:20240902T114500Z
+DTSTART:20240902T114500Z
+DTEND:20240902T123000Z
+DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16
+SUMMARY: Roberto QUIJADA 🇻🇪 - 🇨🇳 ZHAI Xiang
+LOCATION:South Paris Arena 4
+END:VEVENT
+BEGIN:VEVENT
 UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS6-ROUND-OF-16-AUS-ITA
 DTSTAMP:20240902T114500Z
 DTSTART:20240902T114500Z
@@ -1775,16 +1781,6 @@ SUMMARY: Yuttajak GLINBANCHEUN 🇹🇭 - 🇦🇷 Gabriel COPOLA
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T114500Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16
-DTSTAMP:20240902T114500Z
-DTSTART:20240902T114500Z
-DTEND:20240902T123000Z
-DESCRIPTION:Para Table Tennis - Men's Singles - MS3 - Round of 16\n🇨🇳
-  ZHAI Xiang
-SUMMARY:Men's Singles - MS3 - Round of 16
-LOCATION:South Paris Arena 4
-END:VEVENT
-BEGIN:VEVENT
 UID:20240902T150000Z-para-table-tennis-MENS-SINGLES-MS3-ROUND-OF-16-UKR-GER
 DTSTAMP:20240902T150000Z
 DTSTART:20240902T150000Z
diff --git a/docs/today.html b/docs/today.html
index a12bb50bd..657619c27 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -29201,7 +29201,7 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T093000Z" data-end="20240902T101500Z" data-noc="CZE" >
+<div class="event py-4 " data-start="20240902T093000Z" data-end="20240902T101500Z" data-noc="CZE,POL" >
  <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>
@@ -29213,7 +29213,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles - MS2 - Round of 16</div>
-    <div class="competitor CZE">🇨🇿 Jiri SUCHANEK </div>
+    <div class="competitors">
+      Jiri SUCHANEK
+      🇨🇿
+      -
+      🇵🇱
+      Tomasz JAKIMCZUK
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240902T093000Z" data-end="20240902T103000Z" data-noc="ARG,COL" >
@@ -30224,6 +30230,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T110000Z" data-end="20240902T114500Z" data-noc="ESP,GER" >
+ <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>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS3 - Round of 16</div>
+    <div class="competitors">
+      Eder RODRIGUEZ
+      🇪🇸
+      -
+      🇩🇪
+      Thomas BRUECHLE
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T110000Z" data-end="20240902T114500Z" data-noc="GBR,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">
   <span class="time-start">__:__</span>
@@ -30245,6 +30272,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T110000Z" data-end="20240902T114500Z" data-noc="KOR,POL" >
+ <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>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS3 - Round of 16</div>
+    <div class="competitors">
+      JANG Yeongjin
+      🇰🇷
+      -
+      🇵🇱
+      Maciej NALEPKA
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T110000Z" data-end="20240902T114500Z" data-noc="FRA,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">
   <span class="time-start">__:__</span>
@@ -30287,36 +30335,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T110000Z" data-end="20240902T114500Z" data-noc="GER" >
- <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>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS3 - Round of 16</div>
-    <div class="competitor GER">🇩🇪 Thomas BRUECHLE </div>
- </div>
-</div>
-<div class="event py-4 " data-start="20240902T110000Z" data-end="20240902T114500Z" data-noc="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">
-  <span class="time-start">__:__</span>
-  <div class="time-end text-xs">__:__</div>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS3 - Round of 16</div>
-    <div class="competitor KOR">🇰🇷 JANG Yeongjin </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240902T110000Z" data-end="20240902T131500Z" 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">
   <span class="time-start">__:__</span>
@@ -30476,6 +30494,27 @@
     </div>
  </div>
 </div>
+<div class="event py-4 " data-start="20240902T114500Z" data-end="20240902T123000Z" data-noc="CHN,VEN" >
+ <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>
+ </div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">
+   
+   PARA TABLE TENNIS
+   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
+   </div>
+   <div>Men's Singles - MS3 - Round of 16</div>
+    <div class="competitors">
+      Roberto QUIJADA
+      🇻🇪
+      -
+      🇨🇳
+      ZHAI Xiang
+    </div>
+ </div>
+</div>
 <div class="event py-4 " data-start="20240902T114500Z" data-end="20240902T123000Z" data-noc="AUS,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">
   <span class="time-start">__:__</span>
@@ -30518,21 +30557,6 @@
     </div>
  </div>
 </div>
-<div class="event py-4 " data-start="20240902T114500Z" data-end="20240902T123000Z" data-noc="CHN" >
- <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>
- </div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">
-   
-   PARA TABLE TENNIS
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div>Men's Singles - MS3 - Round of 16</div>
-    <div class="competitor CHN">🇨🇳 ZHAI Xiang </div>
- </div>
-</div>
 <div class="event py-4 " data-start="20240902T114500Z" data-end="20240902T133000Z" data-noc="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">
   <span class="time-start">__:__</span>