diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 3a3af40dc..20c0e89f7 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -1488,16 +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🇮🇹 Tommaso
-  MARINI
-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
@@ -1512,6 +1502,16 @@ 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
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32-POL-CZE
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
@@ -1597,8 +1597,7 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
-  Long
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1607,7 +1606,8 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
+  Long
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index 1c32d67f1..e5060c240 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -842,12 +842,12 @@ SUMMARY:🏊 Women's 100m Butterfly Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 7f1832850..abb67139b 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -1369,12 +1369,12 @@ SUMMARY:🏊 Men's 400m Individual Medley Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index e43c1cb64..a808ef1fb 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -7302,12 +7302,12 @@ SUMMARY:🥊 Georgii KUSHITASHVILI 🇬🇪 - 🇹🇯 Davlat BOLTAEV
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -9446,16 +9446,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🇮🇹 Tommaso
-  MARINI
-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
@@ -9470,6 +9460,16 @@ 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
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32-POL-CZE
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
@@ -9870,8 +9870,7 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
-  Long
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -9880,7 +9879,8 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
+  Long
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/surfing/AUS.ics b/docs/surfing/AUS.ics
index 451f72438..edd876d5e 100644
--- a/docs/surfing/AUS.ics
+++ b/docs/surfing/AUS.ics
@@ -44,12 +44,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 4
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/FRA.ics b/docs/surfing/FRA.ics
index 0dda8f3cd..0479b1522 100644
--- a/docs/surfing/FRA.ics
+++ b/docs/surfing/FRA.ics
@@ -44,12 +44,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 5
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index dcd95ce3b..4b05ece36 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -191,12 +191,12 @@ SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-AUS-FRA
+UID:20240728T184800Z-surfing-WOMENS-ROUND-2-HEAT-4-FRA-AUS
 DTSTAMP:20240728T184800Z
 DTSTART:20240728T184800Z
 DTEND:20240728T191800Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 4
-SUMMARY:🏄 Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
+SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 098593555..bb4d1a090 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -10234,7 +10234,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T184800Z" data-end="20240728T191800Z" data-noc="AUS,FRA">
+<div class="event py-4" data-start="20240728T184800Z" data-end="20240728T191800Z" data-noc="FRA,AUS">
  <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">
@@ -10242,7 +10242,7 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Molly PICKLUM 🇦🇺 - 🇫🇷 Johanne DEFAY
+   <div class="">Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
    </div>
  </div>
 </div>
@@ -13144,19 +13144,6 @@
    </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 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 ITA">🇮🇹 Tommaso MARINI</div>
-   </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">
@@ -13183,6 +13170,19 @@
    </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 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 ITA">🇮🇹 Tommaso MARINI</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">
@@ -13827,19 +13827,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="HKG">
- <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 HKG">🇭🇰 CHEUNG Ka Long</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="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">
@@ -13853,6 +13840,19 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="HKG">
+ <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 HKG">🇭🇰 CHEUNG Ka Long</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="CIV,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">