diff --git a/docs/fencing/FRA.ics b/docs/fencing/FRA.ics
index c5980a877..429701966 100644
--- a/docs/fencing/FRA.ics
+++ b/docs/fencing/FRA.ics
@@ -188,8 +188,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
@@ -198,8 +198,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 3fa7785c8..acc8a43aa 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -828,8 +828,7 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
-  KOCH
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -838,7 +837,8 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
+  KOCH
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1343,8 +1343,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
@@ -1353,8 +1353,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
@@ -1491,6 +1491,15 @@ 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
+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🇮🇹 Tommaso
   MARINI
 SUMMARY:🤺 Men's Foil Individual Table of 32
@@ -1506,15 +1515,6 @@ 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
-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 714d288b3..e1ab7e680 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -1476,8 +1476,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
@@ -1486,8 +1486,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/general.ics b/docs/general/general.ics
index 5fe2f8047..642094833 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -5586,8 +5586,7 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
-  KOCH
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -5596,7 +5595,8 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
+  KOCH
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -8155,8 +8155,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
@@ -8165,8 +8165,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
@@ -8987,6 +8987,15 @@ 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
+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🇮🇹 Tommaso
   MARINI
 SUMMARY:🤺 Men's Foil Individual Table of 32
@@ -9002,15 +9011,6 @@ 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
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32-POL-CZE
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
diff --git a/docs/today.html b/docs/today.html
index d641374d9..9d277bc14 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -3573,7 +3573,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T001200Z" data-end="20240728T004200Z" data-noc="NCA,FRA,CRC">
+<div class="event py-4" data-start="20240728T001200Z" data-end="20240728T004200Z" data-noc="CRC,FRA,NCA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
@@ -3584,7 +3584,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T004800Z" data-end="20240728T011800Z" data-noc="BRA,GER,BRA">
+<div class="event py-4" data-start="20240728T004800Z" data-end="20240728T011800Z" data-noc="BRA,BRA,GER">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
@@ -3595,7 +3595,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T012400Z" data-end="20240728T015400Z" data-noc="ESP,CHN,NZL">
+<div class="event py-4" data-start="20240728T012400Z" data-end="20240728T015400Z" data-noc="CHN,NZL,ESP">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">SURFING</div>
@@ -5503,15 +5503,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="HUN">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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</div>
-   <div class="">Men's Épée Individual Table of 32
-<div class="competitor HUN">🇭🇺 Mate Tamas KOCH</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="FRA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -5521,6 +5512,15 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="HUN">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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</div>
+   <div class="">Men's Épée Individual Table of 32
+<div class="competitor HUN">🇭🇺 Mate Tamas KOCH</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="CZE,FRA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8081,7 +8081,7 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">FENCING</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>
@@ -8090,7 +8090,7 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">FENCING</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>
@@ -8831,6 +8831,15 @@
    </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 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</div>
+   <div class="">Men's Foil Individual Table of 32
+<div class="competitor EGY">🇪🇬 Mohamed HAMZA</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="ITA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8849,15 +8858,6 @@
    </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 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</div>
-   <div class="">Men's Foil Individual Table of 32
-<div class="competitor EGY">🇪🇬 Mohamed HAMZA</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 pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">