diff --git a/docs/badminton/general.ics b/docs/badminton/general.ics
index 7abb3138c..350708bfa 100644
--- a/docs/badminton/general.ics
+++ b/docs/badminton/general.ics
@@ -4,33 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//badminton/general//EN
 X-WR-CALNAME:🏸 Badminton | Paris 2024
 NAME:🏸 Badminton | Paris 2024
 BEGIN:VEVENT
-UID:20240727T063000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T063000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T091000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-KOR-A
 DTSTAMP:20240727T063000Z
 DTSTART:20240727T063000Z
@@ -49,24 +22,6 @@ SUMMARY:🏸 FENG/HUANG 🇨🇳 - 🇺🇸 CHIU/GAI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T063000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T063000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T063000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-N-CHN-
 DTSTAMP:20240727T063000Z
 DTSTART:20240727T063000Z
@@ -157,33 +112,6 @@ SUMMARY:🏸 MATSUMOTO/NAGAHARA 🇯🇵 - 🇮🇩 RAHAYU/RAMADHANTI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T120000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T144000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-C-HKG-T
 DTSTAMP:20240727T120000Z
 DTSTART:20240727T120000Z
@@ -193,15 +121,6 @@ SUMMARY:🏸 TANG/TSE 🇭🇰 - 🇹🇼 YE/LEE
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T120000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T120000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-CHN-
 DTSTAMP:20240727T120000Z
 DTSTART:20240727T120000Z
@@ -220,15 +139,6 @@ SUMMARY:🏸 YEUNG NT/YEUNG PL 🇭🇰 - 🇧🇬 G. STOEVA/S. STOEVA
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T120000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T125000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-C-INA-GE
 DTSTAMP:20240727T125000Z
 DTSTART:20240727T125000Z
@@ -301,15 +211,6 @@ SUMMARY:🏸 Jonatan CHRISTIE 🇮🇩 - 🇧🇪 Julien CARRAGGI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T173000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T201000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T173000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-THA-FR
 DTSTAMP:20240727T173000Z
 DTSTART:20240727T173000Z
@@ -319,33 +220,6 @@ SUMMARY:🏸 JOMKOH/KEDREN 🇹🇭 - 🇫🇷 C. POPOV/TJ POPOV
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T173000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T185000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T173000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T201000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T185000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-C-JPN-
 DTSTAMP:20240727T173000Z
 DTSTART:20240727T173000Z
@@ -445,24 +319,6 @@ SUMMARY:🏸 KITITHARAK/PRAJONGJAI 🇹🇭 - 🇫🇷 LAMBERT/TRAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T075000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T063000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T083000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T063000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-D-JPN-KA
 DTSTAMP:20240728T063000Z
 DTSTART:20240728T063000Z
@@ -472,15 +328,6 @@ SUMMARY:🏸 NISHIMOTO Kenta 🇯🇵 - 🇰🇿 Dmitriy PANARIN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T075000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-D-CHN-S
 DTSTAMP:20240728T063000Z
 DTSTART:20240728T063000Z
@@ -490,15 +337,6 @@ SUMMARY:🏸 FENG/HUANG 🇨🇳 - 🇸🇬 HEE/TAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T075000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T063000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-A-JPN-
 DTSTAMP:20240728T063000Z
 DTSTART:20240728T063000Z
@@ -508,15 +346,6 @@ SUMMARY:🏸 MATSUMOTO/NAGAHARA 🇯🇵 - 🇲🇾 TAN/THINAAH
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T083000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T072000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-A-MAS-CA
 DTSTAMP:20240728T072000Z
 DTSTART:20240728T072000Z
@@ -598,15 +427,6 @@ SUMMARY:🏸 OHORI Aya 🇯🇵 - 🇹🇷 Neslihan ARIN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T124000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-KOR-FR
 DTSTAMP:20240728T120000Z
 DTSTART:20240728T120000Z
@@ -616,15 +436,6 @@ SUMMARY:🏸 KANG/SEO 🇰🇷 - 🇫🇷 C. POPOV/TJ POPOV
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T144000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-H-INA-US
 DTSTAMP:20240728T120000Z
 DTSTART:20240728T120000Z
@@ -634,15 +445,6 @@ SUMMARY:🏸 Anthony Sinisuka GINTING 🇮🇩 - 🇺🇸 Howard SHU
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T132000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-A-CHN-I
 DTSTAMP:20240728T120000Z
 DTSTART:20240728T120000Z
@@ -652,24 +454,6 @@ SUMMARY:🏸 ZHENG/HUANG 🇨🇳 - 🇮🇩 RIVALDY/MENTARI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T124000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T120000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T144000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T125000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-A-KOR-F
 DTSTAMP:20240728T125000Z
 DTSTART:20240728T125000Z
@@ -751,24 +535,6 @@ SUMMARY:🏸 H. S. PRANNOY 🇮🇳 - 🇩🇪 Fabian ROTH
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T181000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T173000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T185000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T173000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-E-DEN-AU
 DTSTAMP:20240728T173000Z
 DTSTART:20240728T173000Z
@@ -778,15 +544,6 @@ SUMMARY:🏸 Anders ANTONSEN 🇩🇰 - 🇦🇹 Collins Valentine FILIMON
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T201000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T173000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-THA-A
 DTSTAMP:20240728T173000Z
 DTSTART:20240728T173000Z
@@ -796,24 +553,6 @@ SUMMARY:🏸 PUAVARANUK/TAERATTANA 🇹🇭 - 🇩🇿 K. MAMMERI/T. MAMMERI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T181000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T185000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-L-ESP-
 DTSTAMP:20240728T173000Z
 DTSTART:20240728T173000Z
diff --git a/docs/fencing/FRA.ics b/docs/fencing/FRA.ics
index c6f5232b7..14a1e8d6a 100644
--- a/docs/fencing/FRA.ics
+++ b/docs/fencing/FRA.ics
@@ -251,8 +251,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -261,8 +261,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 20c0e89f7..66b07bf41 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -1340,8 +1340,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1350,8 +1350,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1488,15 +1488,6 @@ UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
 DTEND:20240729T103500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇫🇷 Enzo LEFORT
-SUMMARY:🤺 Men's Foil Individual Table of 32
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
-DTSTAMP:20240729T100500Z
-DTSTART:20240729T100500Z
-DTEND:20240729T103500Z
 DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇪🇬 Mohamed HAMZA
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
@@ -1512,6 +1503,15 @@ SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
+DTSTAMP:20240729T100500Z
+DTSTART:20240729T100500Z
+DTEND:20240729T103500Z
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇫🇷 Enzo LEFORT
+SUMMARY:🤺 Men's Foil Individual Table of 32
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32-POL-CZE
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 7906f5091..ab8330f3d 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -1505,8 +1505,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1515,8 +1515,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/general/GER.ics b/docs/general/GER.ics
index 3553f814c..cf1df1dfa 100644
--- a/docs/general/GER.ics
+++ b/docs/general/GER.ics
@@ -1022,12 +1022,12 @@ SUMMARY:🏓 Tiago APOLONIA 🇵🇹 - 🇩🇪 Dang QIU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 17a72f50d..20e13ebc1 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1087,12 +1087,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index b1dac84ca..b29d95ab1 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -495,33 +495,6 @@ SUMMARY:Paris 2024 - Opening ceremony
 Location:Paris
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T063000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T063000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T091000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-KOR-A
 DTSTAMP:20240727T063000Z
 DTSTART:20240727T063000Z
@@ -540,24 +513,6 @@ SUMMARY:🏸 FENG/HUANG 🇨🇳 - 🇺🇸 CHIU/GAI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T063000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T063000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T063000Z
-DTSTART:20240727T063000Z
-DTEND:20240727T075000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T063000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-N-CHN-
 DTSTAMP:20240727T063000Z
 DTSTART:20240727T063000Z
@@ -1837,33 +1792,6 @@ SUMMARY:🤺 Eli DERSHWITZ 🇺🇸 - 🇭🇺 Csanad GEMESI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T120000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T144000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-C-HKG-T
 DTSTAMP:20240727T120000Z
 DTSTART:20240727T120000Z
@@ -1873,15 +1801,6 @@ SUMMARY:🏸 TANG/TSE 🇭🇰 - 🇹🇼 YE/LEE
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T120000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T120000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-CHN-
 DTSTAMP:20240727T120000Z
 DTSTART:20240727T120000Z
@@ -1900,15 +1819,6 @@ SUMMARY:🏸 YEUNG NT/YEUNG PL 🇭🇰 - 🇧🇬 G. STOEVA/S. STOEVA
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T120000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T120000Z
-DTSTART:20240727T120000Z
-DTEND:20240727T132000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T120000Z-beach-volleyball-MENS-PRELIMINARY-PHASE-POOL-D-USA-CUB
 DTSTAMP:20240727T120000Z
 DTSTART:20240727T120000Z
@@ -2968,15 +2878,6 @@ SUMMARY:🤺 Eszter MUHARI 🇭🇺 - 🇫🇷 Auriane MALLO-BRETON
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T173000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T201000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T173000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-THA-FR
 DTSTAMP:20240727T173000Z
 DTSTART:20240727T173000Z
@@ -2986,33 +2887,6 @@ SUMMARY:🏸 JOMKOH/KEDREN 🇹🇭 - 🇫🇷 C. POPOV/TJ POPOV
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T173000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T185000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T173000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T201000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240727T173000Z
-DTSTART:20240727T173000Z
-DTEND:20240727T185000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-C-JPN-
 DTSTAMP:20240727T173000Z
 DTSTART:20240727T173000Z
@@ -3720,24 +3594,6 @@ SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T075000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T063000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T083000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T063000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-D-JPN-KA
 DTSTAMP:20240728T063000Z
 DTSTART:20240728T063000Z
@@ -3747,15 +3603,6 @@ SUMMARY:🏸 NISHIMOTO Kenta 🇯🇵 - 🇰🇿 Dmitriy PANARIN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T075000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T063000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-D-CHN-S
 DTSTAMP:20240728T063000Z
 DTSTART:20240728T063000Z
@@ -3765,15 +3612,6 @@ SUMMARY:🏸 FENG/HUANG 🇨🇳 - 🇸🇬 HEE/TAN
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T075000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T063000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-A-JPN-
 DTSTAMP:20240728T063000Z
 DTSTART:20240728T063000Z
@@ -3783,15 +3621,6 @@ SUMMARY:🏸 MATSUMOTO/NAGAHARA 🇯🇵 - 🇲🇾 TAN/THINAAH
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T063000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T063000Z
-DTSTART:20240728T063000Z
-DTEND:20240728T083000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T070000Z-beach-volleyball-WOMENS-PRELIMINARY-PHASE-POOL-A-ITA-E
 DTSTAMP:20240728T070000Z
 DTSTART:20240728T070000Z
@@ -5990,15 +5819,6 @@ SUMMARY:⛵ Women's Skiff - Race 3
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T124000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-KOR-FR
 DTSTAMP:20240728T120000Z
 DTSTART:20240728T120000Z
@@ -6008,15 +5828,6 @@ SUMMARY:🏸 KANG/SEO 🇰🇷 - 🇫🇷 C. POPOV/TJ POPOV
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T144000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-H-INA-US
 DTSTAMP:20240728T120000Z
 DTSTART:20240728T120000Z
@@ -6026,15 +5837,6 @@ SUMMARY:🏸 Anthony Sinisuka GINTING 🇮🇩 - 🇺🇸 Howard SHU
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T132000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-A-CHN-I
 DTSTAMP:20240728T120000Z
 DTSTART:20240728T120000Z
@@ -6044,24 +5846,6 @@ SUMMARY:🏸 ZHENG/HUANG 🇨🇳 - 🇮🇩 RIVALDY/MENTARI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T120000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T124000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T120000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T120000Z
-DTSTART:20240728T120000Z
-DTEND:20240728T144000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T120000Z-handball-WOMENS-PRELIMINARY-ROUND-GROUP-A-SWE-GER
 DTSTAMP:20240728T120000Z
 DTSTART:20240728T120000Z
@@ -7026,24 +6810,6 @@ SUMMARY:🎾 Ajla TOMLJANOVIC 🇦🇺 - 🇺🇸 Coco GAUFF
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173000Z-badminton-MENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T181000Z
-DESCRIPTION:Badminton - Men's Doubles Group play stage
-SUMMARY:🏸 Men's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T173000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T185000Z
-DESCRIPTION:Badminton - Men's Singles Group play stage
-SUMMARY:🏸 Men's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T173000Z-badminton-MENS-SINGLES-GROUP-PLAY-STAGE-GROUP-E-DEN-AU
 DTSTAMP:20240728T173000Z
 DTSTART:20240728T173000Z
@@ -7053,15 +6819,6 @@ SUMMARY:🏸 Anders ANTONSEN 🇩🇰 - 🇦🇹 Collins Valentine FILIMON
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T201000Z
-DESCRIPTION:Badminton - Mixed Doubles Group play stage
-SUMMARY:🏸 Mixed Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T173000Z-badminton-MIXED-DOUBLES-GROUP-PLAY-STAGE-GROUP-B-THA-A
 DTSTAMP:20240728T173000Z
 DTSTART:20240728T173000Z
@@ -7071,24 +6828,6 @@ SUMMARY:🏸 PUAVARANUK/TAERATTANA 🇹🇭 - 🇩🇿 K. MAMMERI/T. MAMMERI
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T173000Z-badminton-WOMENS-DOUBLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T181000Z
-DESCRIPTION:Badminton - Women's Doubles Group play stage
-SUMMARY:🏸 Women's Doubles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
-UID:20240728T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE
-DTSTAMP:20240728T173000Z
-DTSTART:20240728T173000Z
-DTEND:20240728T185000Z
-DESCRIPTION:Badminton - Women's Singles Group play stage
-SUMMARY:🏸 Women's Singles Group play stage
-LOCATION:La Chapelle Arena
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T173000Z-badminton-WOMENS-SINGLES-GROUP-PLAY-STAGE-GROUP-L-ESP-
 DTSTAMP:20240728T173000Z
 DTSTART:20240728T173000Z
@@ -7700,12 +7439,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -8221,8 +7960,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -8231,8 +7970,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -9173,15 +8912,6 @@ SUMMARY:🎾 SCHUURS/KOOLHOF 🇳🇱 - 🇬🇷 SAKKARI/TSITSIPAS
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100000Z-tennis-ORDER-OF-PLAY-AVAILABLE-EVENING-BEFORE
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
-DTEND:20240729T200000Z
-DESCRIPTION:Tennis - Order of play available evening before
-SUMMARY:🎾 Order of play available evening before
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-DOUBLES-FIRST-ROUND
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
@@ -9401,15 +9131,6 @@ UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
 DTEND:20240729T103500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇫🇷 Enzo LEFORT
-SUMMARY:🤺 Men's Foil Individual Table of 32
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
-DTSTAMP:20240729T100500Z
-DTSTART:20240729T100500Z
-DTEND:20240729T103500Z
 DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇪🇬 Mohamed HAMZA
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
@@ -9425,6 +9146,15 @@ SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
+DTSTAMP:20240729T100500Z
+DTSTART:20240729T100500Z
+DTEND:20240729T103500Z
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇫🇷 Enzo LEFORT
+SUMMARY:🤺 Men's Foil Individual Table of 32
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32-POL-CZE
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
diff --git a/docs/surfing/GER.ics b/docs/surfing/GER.ics
index 1ad644eaf..139747ec7 100644
--- a/docs/surfing/GER.ics
+++ b/docs/surfing/GER.ics
@@ -33,12 +33,12 @@ SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/JPN.ics b/docs/surfing/JPN.ics
index b6c7ee813..ef52e910c 100644
--- a/docs/surfing/JPN.ics
+++ b/docs/surfing/JPN.ics
@@ -62,12 +62,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 40f03d2dd..31c7d07ae 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -245,12 +245,12 @@ SUMMARY:🏄 IGARASHI Kanoa 🇯🇵 - 🇮🇹 Leonardo FIORAVANTI
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-GER-JPN
+UID:20240728T222400Z-surfing-MENS-ROUND-2-HEAT-2-JPN-GER
 DTSTAMP:20240728T222400Z
 DTSTART:20240728T222400Z
 DTEND:20240728T230400Z
 DESCRIPTION:Surfing - Men's Round 2 - Heat 2
-SUMMARY:🏄 Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
+SUMMARY:🏄 O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/tennis/general.ics b/docs/tennis/general.ics
index 117010216..c61a2a34f 100644
--- a/docs/tennis/general.ics
+++ b/docs/tennis/general.ics
@@ -897,15 +897,6 @@ SUMMARY:🎾 SCHUURS/KOOLHOF 🇳🇱 - 🇬🇷 SAKKARI/TSITSIPAS
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100000Z-tennis-ORDER-OF-PLAY-AVAILABLE-EVENING-BEFORE
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
-DTEND:20240729T200000Z
-DESCRIPTION:Tennis - Order of play available evening before
-SUMMARY:🎾 Order of play available evening before
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-DOUBLES-FIRST-ROUND
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/today.html b/docs/today.html
index 2f3f854ae..29e292c06 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -752,41 +752,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T063000Z" data-end="20240727T075000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240727T063000Z" data-end="20240727T075000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240727T063000Z" data-end="20240727T091000Z" 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">
-   
-   BADMINTON
-   </div>
-   <div class="">Mixed Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T063000Z" data-end="20240727T071000Z" data-noc="KOR,ALG">
  <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">
@@ -809,30 +774,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T063000Z" data-end="20240727T075000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240727T063000Z" data-end="20240727T075000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T063000Z" data-end="20240727T071000Z" data-noc="CHN,AZE">
  <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">
@@ -2618,41 +2559,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T120000Z" data-end="20240727T132000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240727T120000Z" data-end="20240727T132000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240727T120000Z" data-end="20240727T144000Z" 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">
-   
-   BADMINTON
-   </div>
-   <div class="">Mixed Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T120000Z" data-end="20240727T124000Z" data-noc="HKG,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">
@@ -2664,18 +2570,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T120000Z" data-end="20240727T132000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T120000Z" data-end="20240727T124000Z" data-noc="CHN,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">
@@ -2700,18 +2594,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T120000Z" data-end="20240727T132000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T120000Z" data-end="20240727T125000Z" data-noc="USA,CUB">
  <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">
@@ -4205,18 +4087,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T173000Z" data-end="20240727T201000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T173000Z" data-end="20240727T181000Z" data-noc="THA,FRA">
  <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">
@@ -4229,42 +4099,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T173000Z" data-end="20240727T185000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240727T173000Z" data-end="20240727T201000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240727T173000Z" data-end="20240727T185000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T173000Z" data-end="20240727T181000Z" data-noc="JPN,MYA">
  <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">
@@ -5238,30 +5072,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T063000Z" data-end="20240728T075000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240728T063000Z" data-end="20240728T083000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T063000Z" data-end="20240728T071000Z" data-noc="JPN,KAZ">
  <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">
@@ -5274,17 +5084,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T063000Z" data-end="20240728T075000Z" 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">
-   
-   BADMINTON
-   </div>
-   <div class="">Mixed Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T063000Z" data-end="20240728T071000Z" data-noc="CHN,SGP">
  <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">
@@ -5296,18 +5095,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T063000Z" data-end="20240728T075000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T063000Z" data-end="20240728T071000Z" data-noc="JPN,MAS">
  <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">
@@ -5320,18 +5107,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T063000Z" data-end="20240728T083000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T070000Z" data-end="20240728T075000Z" data-noc="ITA,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">
@@ -8418,18 +8193,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T120000Z" data-end="20240728T124000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T120000Z" data-end="20240728T124000Z" data-noc="KOR,FRA">
  <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">
@@ -8442,18 +8205,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T120000Z" data-end="20240728T144000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T120000Z" data-end="20240728T124000Z" data-noc="INA,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">
@@ -8466,17 +8217,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T120000Z" data-end="20240728T132000Z" 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">
-   
-   BADMINTON
-   </div>
-   <div class="">Mixed Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T120000Z" data-end="20240728T124000Z" data-noc="CHN,INA">
  <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">
@@ -8488,30 +8228,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T120000Z" data-end="20240728T124000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240728T120000Z" data-end="20240728T144000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T120000Z" data-end="20240728T133000Z" data-noc="SWE,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -9860,30 +9576,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T173000Z" data-end="20240728T181000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
-   </div>
-   <div class="">Men's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240728T173000Z" data-end="20240728T185000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T173000Z" data-end="20240728T181000Z" data-noc="DEN,AUT">
  <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">
@@ -9896,17 +9588,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T173000Z" data-end="20240728T201000Z" 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">
-   
-   BADMINTON
-   </div>
-   <div class="">Mixed Doubles Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T173000Z" data-end="20240728T181000Z" data-noc="THA,ALG">
  <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">
@@ -9918,30 +9599,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T173000Z" data-end="20240728T181000Z" 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">
-   
-   BADMINTON
-   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
-   </div>
-   <div class="">Women's Doubles Group play stage
-   </div>
- </div>
-</div>
-<div class="event py-4" data-start="20240728T173000Z" data-end="20240728T185000Z" 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">
-   
-   BADMINTON
-   <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 Group play stage
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T173000Z" data-end="20240728T181000Z" data-noc="ESP,SUI">
  <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">
@@ -10206,7 +9863,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T183000Z" data-end="20240728T184000Z" data-noc="NZL,JPN,JPN,FRA,GBR,USA,ITA,GER">
+<div class="event py-4" data-start="20240728T183000Z" data-end="20240728T184000Z" data-noc="FRA,JPN,USA,GBR,ITA,NZL,JPN,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10238,7 +9895,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T184000Z" data-end="20240728T184600Z" data-noc="JPN,CAN,CHN,USA,USA,GER,AUS,SWE">
+<div class="event py-4" data-start="20240728T184000Z" data-end="20240728T184600Z" data-noc="USA,USA,CHN,GER,CAN,AUS,JPN,SWE">
  <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">
@@ -10768,7 +10425,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T222400Z" data-end="20240728T230400Z" data-noc="GER,JPN">
+<div class="event py-4" data-start="20240728T222400Z" data-end="20240728T230400Z" data-noc="JPN,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">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">
@@ -10776,7 +10433,7 @@
    SURFING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Tim ELTER 🇩🇪 - 🇯🇵 O'LEARY Connor
+   <div class="">O'LEARY Connor 🇯🇵 - 🇩🇪 Tim ELTER
    </div>
  </div>
 </div>
@@ -11498,7 +11155,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's Sabre Individual Table of 32
-<div class="competitor FRA">🇫🇷 Sara BALZER</div>
+<div class="competitor FRA">🇫🇷 Manon APITHY-BRUNET</div>
    </div>
  </div>
 </div>
@@ -11511,7 +11168,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's Sabre Individual Table of 32
-<div class="competitor FRA">🇫🇷 Manon APITHY-BRUNET</div>
+<div class="competitor FRA">🇫🇷 Sara BALZER</div>
    </div>
  </div>
 </div>
@@ -12771,17 +12428,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T100000Z" data-end="20240729T200000Z" 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">
-   
-   TENNIS
-   </div>
-   <div class="">Order of play available evening before
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T100000Z" data-end="20240729T113000Z" data-noc="CZE">
  <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">
@@ -13084,19 +12730,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="FRA">
- <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">
-   
-   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 Foil Individual Table of 32
-<div class="competitor FRA">🇫🇷 Enzo LEFORT</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="EGY">
  <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">
@@ -13123,6 +12756,19 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="FRA">
+ <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">
+   
+   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 Foil Individual Table of 32
+<div class="competitor FRA">🇫🇷 Enzo LEFORT</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="POL,CZE">
  <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">