diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index 20dc5969e..310b64074 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -838,12 +838,12 @@ SUMMARY:🏓 Andy PEREIRA 🇨🇺 - 🇧🇷 Hugo CALDERANO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-NCA-BRA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+SUMMARY:🏄 Candelaria RESANO 🇳🇮 - 🇧🇷 Tatiana WESTON-WEBB
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/DEN.ics b/docs/general/DEN.ics
index 63ffbbcb2..408cd7443 100644
--- a/docs/general/DEN.ics
+++ b/docs/general/DEN.ics
@@ -379,6 +379,15 @@ SUMMARY:🏸 ASTRUP/RASMUSSEN 🇩🇰 - 🇹🇼 LEE/WANG
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-DEN-USA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Women's Singles Second Round
+SUMMARY:🎾 Caroline WOZNIACKI 🇩🇰 - 🇺🇸 Danielle COLLINS
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100500Z-sailing-MENS-SKIFF-RACE-4
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
diff --git a/docs/general/NCA.ics b/docs/general/NCA.ics
index 00d257894..510a16f2d 100644
--- a/docs/general/NCA.ics
+++ b/docs/general/NCA.ics
@@ -47,12 +47,12 @@ SUMMARY:🔫 10m Air Rifle Women's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-NCA-BRA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+SUMMARY:🏄 Candelaria RESANO 🇳🇮 - 🇧🇷 Tatiana WESTON-WEBB
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 403c1571b..f73f5629e 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -1352,15 +1352,6 @@ SUMMARY:🎾 FRITZ/PAUL 🇺🇸 - 🇨🇦 AUGER-ALIASSIME/RAONI
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
-DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Women's Singles Second Round\n🇺🇸 Danielle COLLINS
-SUMMARY:🎾 Women's Singles Second Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-ARG-USA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
@@ -1370,6 +1361,15 @@ SUMMARY:🎾 Maria Lourdes CARLE 🇦🇷 - 🇺🇸 Coco GAUFF
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-DEN-USA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Women's Singles Second Round
+SUMMARY:🎾 Caroline WOZNIACKI 🇩🇰 - 🇺🇸 Danielle COLLINS
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-USA-BUL
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index 39aff7418..cd826d214 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -7536,12 +7536,12 @@ SUMMARY:🤺 Mohamed ELSAYED 🇪🇬 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-NCA-BRA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+SUMMARY:🏄 Candelaria RESANO 🇳🇮 - 🇧🇷 Tatiana WESTON-WEBB
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -9284,15 +9284,6 @@ BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
-DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Women's Singles Second Round\n🇺🇸 Danielle COLLINS
-SUMMARY:🎾 Women's Singles Second Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
 DTEND:20240729T113000Z
 DESCRIPTION:Tennis - Women's Singles Second Round\n🇨🇳 WANG Xiyu
 SUMMARY:🎾 Women's Singles Second Round
@@ -9344,6 +9335,15 @@ SUMMARY:🎾 Donna VEKIC 🇭🇷 - 🇨🇦 Bianca ANDREESCU
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-DEN-USA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Women's Singles Second Round
+SUMMARY:🎾 Caroline WOZNIACKI 🇩🇰 - 🇺🇸 Danielle COLLINS
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-ESP-CAN
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/surfing/BRA.ics b/docs/surfing/BRA.ics
index 0e6a34687..341f87592 100644
--- a/docs/surfing/BRA.ics
+++ b/docs/surfing/BRA.ics
@@ -54,12 +54,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 6
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-NCA-BRA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+SUMMARY:🏄 Candelaria RESANO 🇳🇮 - 🇧🇷 Tatiana WESTON-WEBB
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/NCA.ics b/docs/surfing/NCA.ics
index 64ab94c6b..7ea1c9138 100644
--- a/docs/surfing/NCA.ics
+++ b/docs/surfing/NCA.ics
@@ -14,12 +14,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 5
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-NCA-BRA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+SUMMARY:🏄 Candelaria RESANO 🇳🇮 - 🇧🇷 Tatiana WESTON-WEBB
 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 4b05ece36..77930638c 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -200,12 +200,12 @@ SUMMARY:🏄 Johanne DEFAY 🇫🇷 - 🇦🇺 Molly PICKLUM
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-BRA-NCA
+UID:20240728T192400Z-surfing-WOMENS-ROUND-2-HEAT-5-NCA-BRA
 DTSTAMP:20240728T192400Z
 DTSTART:20240728T192400Z
 DTEND:20240728T195400Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 5
-SUMMARY:🏄 Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+SUMMARY:🏄 Candelaria RESANO 🇳🇮 - 🇧🇷 Tatiana WESTON-WEBB
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/tennis/DEN.ics b/docs/tennis/DEN.ics
index 06de92916..cb7f1125d 100644
--- a/docs/tennis/DEN.ics
+++ b/docs/tennis/DEN.ics
@@ -21,4 +21,13 @@ DESCRIPTION:Tennis - Women's Singles First Round
 SUMMARY:🎾 Mayar SHERIF 🇪🇬 - 🇩🇰 Caroline WOZNIACKI
 LOCATION:Roland-Garros Stadium
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-DEN-USA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Women's Singles Second Round
+SUMMARY:🎾 Caroline WOZNIACKI 🇩🇰 - 🇺🇸 Danielle COLLINS
+LOCATION:Roland-Garros Stadium
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/tennis/USA.ics b/docs/tennis/USA.ics
index ff0b69442..e3d6ae07c 100644
--- a/docs/tennis/USA.ics
+++ b/docs/tennis/USA.ics
@@ -103,15 +103,6 @@ SUMMARY:🎾 FRITZ/PAUL 🇺🇸 - 🇨🇦 AUGER-ALIASSIME/RAONI
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
-DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Women's Singles Second Round\n🇺🇸 Danielle COLLINS
-SUMMARY:🎾 Women's Singles Second Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-ARG-USA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
@@ -121,6 +112,15 @@ SUMMARY:🎾 Maria Lourdes CARLE 🇦🇷 - 🇺🇸 Coco GAUFF
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-DEN-USA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Women's Singles Second Round
+SUMMARY:🎾 Caroline WOZNIACKI 🇩🇰 - 🇺🇸 Danielle COLLINS
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-USA-BUL
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/tennis/general.ics b/docs/tennis/general.ics
index b94a8f579..9d14935ea 100644
--- a/docs/tennis/general.ics
+++ b/docs/tennis/general.ics
@@ -963,15 +963,6 @@ BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
-DTEND:20240729T143000Z
-DESCRIPTION:Tennis - Women's Singles Second Round\n🇺🇸 Danielle COLLINS
-SUMMARY:🎾 Women's Singles Second Round
-LOCATION:Roland-Garros Stadium
-END:VEVENT
-BEGIN:VEVENT
-UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND
-DTSTAMP:20240729T100000Z
-DTSTART:20240729T100000Z
 DTEND:20240729T113000Z
 DESCRIPTION:Tennis - Women's Singles Second Round\n🇨🇳 WANG Xiyu
 SUMMARY:🎾 Women's Singles Second Round
@@ -1023,6 +1014,15 @@ SUMMARY:🎾 Donna VEKIC 🇭🇷 - 🇨🇦 Bianca ANDREESCU
 LOCATION:Roland-Garros Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-DEN-USA
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T143000Z
+DESCRIPTION:Tennis - Women's Singles Second Round
+SUMMARY:🎾 Caroline WOZNIACKI 🇩🇰 - 🇺🇸 Danielle COLLINS
+LOCATION:Roland-Garros Stadium
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-tennis-WOMENS-SINGLES-SECOND-ROUND-ESP-CAN
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/today.html b/docs/today.html
index 31e07a6c6..5159a2ee8 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -10544,7 +10544,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T192400Z" data-end="20240728T195400Z" data-noc="BRA,NCA">
+<div class="event py-4" data-start="20240728T192400Z" data-end="20240728T195400Z" data-noc="NCA,BRA">
  <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">
@@ -10552,7 +10552,7 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">Tatiana WESTON-WEBB 🇧🇷 - 🇳🇮 Candelaria RESANO
+   <div class="">Candelaria RESANO 🇳🇮 - 🇧🇷 Tatiana WESTON-WEBB
    </div>
  </div>
 </div>
@@ -12915,19 +12915,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T100000Z" data-end="20240729T143000Z" 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">
-   <div class="text-2xl">
-   
-   TENNIS
-   <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 Second Round
-<div class="competitor USA">🇺🇸 Danielle COLLINS</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T100000Z" data-end="20240729T113000Z" data-noc="CHN">
  <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">
@@ -13001,6 +12988,18 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T100000Z" data-end="20240729T143000Z" data-noc="DEN,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">
+   <div class="text-2xl">
+   
+   TENNIS
+   <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
+   </div>
+   <div class="">Caroline WOZNIACKI 🇩🇰 - 🇺🇸 Danielle COLLINS
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T100000Z" data-end="20240729T113000Z" data-noc="ESP,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">