diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index d79c15d5d..0d978fc1a 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -1241,12 +1241,12 @@ SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇯🇵 IGARASHI Kanoa
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-BRA-MAR
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
+SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/CAN.ics b/docs/general/CAN.ics
index e6aac5e0a..47342d352 100644
--- a/docs/general/CAN.ics
+++ b/docs/general/CAN.ics
@@ -1505,6 +1505,15 @@ SUMMARY:🛶 Men's Kayak Single Heats 1st Run
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T140000Z-rugby-sevens-WOMENS-SEMI-FINAL
+DTSTAMP:20240730T140000Z
+DTSTART:20240730T140000Z
+DTEND:20240730T141600Z
+DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇨🇦 CAN
+SUMMARY:🏉 Women's Semi-final
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T141900Z-sailing-MENS-SKIFF-RACE-9
 DTSTAMP:20240730T141900Z
 DTSTART:20240730T141900Z
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 88f70c4a1..0be89f143 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -2732,6 +2732,15 @@ SUMMARY:🛶 Women's Canoe Single Heats 1st Run
 LOCATION:Nautical St - White water
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T130000Z-rugby-sevens-WOMENS-PLACING-5-8
+DTSTAMP:20240730T130000Z
+DTSTART:20240730T130000Z
+DTEND:20240730T131600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇫🇷 FRA
+SUMMARY:🏉 Women's Placing 5-8
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T130000Z-water-polo-MENS-PRELIMINARY-ROUND-GROUP-B-JPN-FRA
 DTSTAMP:20240730T130000Z
 DTSTART:20240730T130000Z
diff --git a/docs/general/MAR.ics b/docs/general/MAR.ics
index ee2ed0730..93925e997 100644
--- a/docs/general/MAR.ics
+++ b/docs/general/MAR.ics
@@ -241,12 +241,12 @@ SUMMARY:🏇 Eventing Individual Jumping Qualifier
 LOCATION:Château de Versailles
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-BRA-MAR
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
+SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index ec7592ad9..626cb7763 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -10977,12 +10977,12 @@ SUMMARY:🏉 FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-BRA-MAR
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
+SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -13101,7 +13101,7 @@ UID:20240730T130000Z-rugby-sevens-WOMENS-PLACING-5-8
 DTSTAMP:20240730T130000Z
 DTSTART:20240730T130000Z
 DTEND:20240730T131600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇫🇷 FRA
 SUMMARY:🏉 Women's Placing 5-8
 LOCATION:Stade de France
 END:VEVENT
@@ -13307,7 +13307,7 @@ UID:20240730T140000Z-rugby-sevens-WOMENS-SEMI-FINAL
 DTSTAMP:20240730T140000Z
 DTSTART:20240730T140000Z
 DTEND:20240730T141600Z
-DESCRIPTION:Rugby Sevens - Women's Semi-final
+DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇨🇦 CAN
 SUMMARY:🏉 Women's Semi-final
 LOCATION:Stade de France
 END:VEVENT
diff --git a/docs/rugby-sevens/CAN.ics b/docs/rugby-sevens/CAN.ics
index 674a7e7dd..f5d18852c 100644
--- a/docs/rugby-sevens/CAN.ics
+++ b/docs/rugby-sevens/CAN.ics
@@ -39,4 +39,13 @@ DESCRIPTION:Rugby Sevens - Women's Quarter-final
 SUMMARY:🏉 FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Stade de France
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T140000Z-rugby-sevens-WOMENS-SEMI-FINAL
+DTSTAMP:20240730T140000Z
+DTSTART:20240730T140000Z
+DTEND:20240730T141600Z
+DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇨🇦 CAN
+SUMMARY:🏉 Women's Semi-final
+LOCATION:Stade de France
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/rugby-sevens/FRA.ics b/docs/rugby-sevens/FRA.ics
index a9affab1e..9e68df9ce 100644
--- a/docs/rugby-sevens/FRA.ics
+++ b/docs/rugby-sevens/FRA.ics
@@ -93,4 +93,13 @@ DESCRIPTION:Rugby Sevens - Women's Quarter-final
 SUMMARY:🏉 FRA 🇫🇷 - 🇨🇦 CAN
 LOCATION:Stade de France
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T130000Z-rugby-sevens-WOMENS-PLACING-5-8
+DTSTAMP:20240730T130000Z
+DTSTART:20240730T130000Z
+DTEND:20240730T131600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇫🇷 FRA
+SUMMARY:🏉 Women's Placing 5-8
+LOCATION:Stade de France
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/rugby-sevens/general.ics b/docs/rugby-sevens/general.ics
index b640501c5..d76610c94 100644
--- a/docs/rugby-sevens/general.ics
+++ b/docs/rugby-sevens/general.ics
@@ -539,7 +539,7 @@ UID:20240730T130000Z-rugby-sevens-WOMENS-PLACING-5-8
 DTSTAMP:20240730T130000Z
 DTSTART:20240730T130000Z
 DTEND:20240730T131600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇫🇷 FRA
 SUMMARY:🏉 Women's Placing 5-8
 LOCATION:Stade de France
 END:VEVENT
@@ -557,7 +557,7 @@ UID:20240730T140000Z-rugby-sevens-WOMENS-SEMI-FINAL
 DTSTAMP:20240730T140000Z
 DTSTART:20240730T140000Z
 DTEND:20240730T141600Z
-DESCRIPTION:Rugby Sevens - Women's Semi-final
+DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇨🇦 CAN
 SUMMARY:🏉 Women's Semi-final
 LOCATION:Stade de France
 END:VEVENT
diff --git a/docs/surfing/BRA.ics b/docs/surfing/BRA.ics
index 3c67e4511..38a86aef4 100644
--- a/docs/surfing/BRA.ics
+++ b/docs/surfing/BRA.ics
@@ -99,12 +99,12 @@ SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇯🇵 IGARASHI Kanoa
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-BRA-MAR
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
+SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/MAR.ics b/docs/surfing/MAR.ics
index f65b9cfab..509f9bf7b 100644
--- a/docs/surfing/MAR.ics
+++ b/docs/surfing/MAR.ics
@@ -23,12 +23,12 @@ SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇸🇻 Bryan PEREZ
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-BRA-MAR
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
+SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 4ff46796b..85ea809ed 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -353,12 +353,12 @@ SUMMARY:🏄 Gabriel MEDINA 🇧🇷 - 🇯🇵 IGARASHI Kanoa
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-BRA-MAR
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
+SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 02d55780c..46d4de9ad 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -16401,7 +16401,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T203000Z" data-noc="MAR,BRA">
+<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T203000Z" data-noc="BRA,MAR">
  <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">
@@ -16410,7 +16410,7 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div class="">Men's Round 3 - Heat 6
-   <div class="">Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA</div>
+   <div class="">Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM</div>
    </div>
  </div>
 </div>
@@ -19630,7 +19630,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T130000Z" data-end="20240730T131600Z" data-noc="">
+<div class="event py-4" data-start="20240730T130000Z" data-end="20240730T131600Z" 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">
@@ -19949,7 +19949,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T140000Z" data-end="20240730T141600Z" data-noc="">
+<div class="event py-4" data-start="20240730T140000Z" data-end="20240730T141600Z" data-noc="CAN">
  <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">