diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 7dc114a62..7b4b5d09d 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -1491,16 +1491,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
@@ -1515,6 +1505,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
@@ -1600,8 +1600,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
@@ -1610,7 +1609,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/general.ics b/docs/general/general.ics
index ae93d3f4d..037ff42c1 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -8987,16 +8987,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
@@ -9011,6 +9001,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
@@ -9299,8 +9299,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
@@ -9309,7 +9308,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
@@ -13204,7 +13204,7 @@ BEGIN:VEVENT
 UID:20240730T154500Z-shooting-50M-RIFLE-3-POSITIONS-MENS-PRE-EVENT-TRAINING
 DTSTAMP:20240730T154500Z
 DTSTART:20240730T154500Z
-DTEND:20240730T170000Z
+DTEND:20240730T171500Z
 DESCRIPTION:Shooting - 50m Rifle 3 Positions Men's Pre-Event Training
 SUMMARY:🔫 50m Rifle 3 Positions Men's Pre-Event Training
 LOCATION:Chateauroux Shooting Ctr
@@ -16014,7 +16014,7 @@ BEGIN:VEVENT
 UID:20240731T154500Z-shooting-50M-RIFLE-3-POSITIONS-WOMENS-PRE-EVENT-TRAINI
 DTSTAMP:20240731T154500Z
 DTSTART:20240731T154500Z
-DTEND:20240731T170000Z
+DTEND:20240731T171500Z
 DESCRIPTION:Shooting - 50m Rifle 3 Positions Women's Pre-Event Training
 SUMMARY:🔫 50m Rifle 3 Positions Women's Pre-Event Training
 LOCATION:Chateauroux Shooting Ctr
diff --git a/docs/shooting/general.ics b/docs/shooting/general.ics
index aaeb73f2e..155fd28e2 100644
--- a/docs/shooting/general.ics
+++ b/docs/shooting/general.ics
@@ -330,7 +330,7 @@ BEGIN:VEVENT
 UID:20240730T154500Z-shooting-50M-RIFLE-3-POSITIONS-MENS-PRE-EVENT-TRAINING
 DTSTAMP:20240730T154500Z
 DTSTART:20240730T154500Z
-DTEND:20240730T170000Z
+DTEND:20240730T171500Z
 DESCRIPTION:Shooting - 50m Rifle 3 Positions Men's Pre-Event Training
 SUMMARY:🔫 50m Rifle 3 Positions Men's Pre-Event Training
 LOCATION:Chateauroux Shooting Ctr
@@ -381,7 +381,7 @@ BEGIN:VEVENT
 UID:20240731T154500Z-shooting-50M-RIFLE-3-POSITIONS-WOMENS-PRE-EVENT-TRAINI
 DTSTAMP:20240731T154500Z
 DTSTART:20240731T154500Z
-DTEND:20240731T170000Z
+DTEND:20240731T171500Z
 DESCRIPTION:Shooting - 50m Rifle 3 Positions Women's Pre-Event Training
 SUMMARY:🔫 50m Rifle 3 Positions Women's Pre-Event Training
 LOCATION:Chateauroux Shooting Ctr
diff --git a/docs/today.html b/docs/today.html
index c7e3f0b08..bd23958aa 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -4054,7 +4054,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,CHN,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
+<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="CHN,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
  <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">EQUESTRIAN</div>
@@ -8831,15 +8831,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 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 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 pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8858,6 +8849,15 @@
    </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">
+   <div class="text-2xl">FENCING</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 pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -9138,15 +9138,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 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 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 pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -9156,6 +9147,15 @@
    </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 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 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 pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -13146,7 +13146,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T154500Z" data-end="20240730T170000Z" data-noc="">
+<div class="event py-4" data-start="20240730T154500Z" data-end="20240730T171500Z" data-noc="">
  <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">SHOOTING</div>
@@ -15903,7 +15903,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T154500Z" data-end="20240731T170000Z" data-noc="">
+<div class="event py-4" data-start="20240731T154500Z" data-end="20240731T171500Z" data-noc="">
  <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">SHOOTING</div>