diff --git a/docs/boxing/ARM.ics b/docs/boxing/ARM.ics
index 217917033..83327e569 100644
--- a/docs/boxing/ARM.ics
+++ b/docs/boxing/ARM.ics
@@ -12,4 +12,13 @@ DESCRIPTION:Boxing - Men's +92kg - Preliminaries - Round of 16
 SUMMARY:🥊 Davit CHALOYAN 🇦🇲 - 🇬🇧 Delicious ORIE
 LOCATION:North Paris Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240802T202400Z-boxing-MENS-92KG-QUARTERFINAL
+DTSTAMP:20240802T202400Z
+DTSTART:20240802T202400Z
+DTEND:20240802T203500Z
+DESCRIPTION:Boxing - Men's +92kg - Quarterfinal\n🇦🇲 Davit CHALOYAN
+SUMMARY:🥊 Men's +92kg - Quarterfinal
+LOCATION:North Paris Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/boxing/general.ics b/docs/boxing/general.ics
index 8884f11cf..f58446f84 100644
--- a/docs/boxing/general.ics
+++ b/docs/boxing/general.ics
@@ -1553,7 +1553,7 @@ UID:20240802T202400Z-boxing-MENS-92KG-QUARTERFINAL
 DTSTAMP:20240802T202400Z
 DTSTART:20240802T202400Z
 DTEND:20240802T203500Z
-DESCRIPTION:Boxing - Men's +92kg - Quarterfinal
+DESCRIPTION:Boxing - Men's +92kg - Quarterfinal\n🇦🇲 Davit CHALOYAN
 SUMMARY:🥊 Men's +92kg - Quarterfinal
 LOCATION:North Paris Arena
 END:VEVENT
diff --git a/docs/general/ARM.ics b/docs/general/ARM.ics
index a4eb3b97f..5e2da7ee1 100644
--- a/docs/general/ARM.ics
+++ b/docs/general/ARM.ics
@@ -45,6 +45,15 @@ SUMMARY:🥊 Davit CHALOYAN 🇦🇲 - 🇬🇧 Delicious ORIE
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240802T202400Z-boxing-MENS-92KG-QUARTERFINAL
+DTSTAMP:20240802T202400Z
+DTSTART:20240802T202400Z
+DTEND:20240802T203500Z
+DESCRIPTION:Boxing - Men's +92kg - Quarterfinal\n🇦🇲 Davit CHALOYAN
+SUMMARY:🥊 Men's +92kg - Quarterfinal
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240811T190000Z-closing-ceremony
 DTSTAMP:20240811T190000Z
 DTSTART:20240811T190000Z
diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index a562dfdfb..d79c15d5d 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-BRA-MAR
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
+SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -1672,6 +1672,15 @@ SUMMARY:🤾 FRA 🇫🇷 - 🇧🇷 BRA
 LOCATION:South Paris Arena 6
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T181200Z-surfing-MENS-QUARTERFINALS-HEAT-3
+DTSTAMP:20240730T181200Z
+DTSTART:20240730T181200Z
+DTEND:20240730T184200Z
+DESCRIPTION:Surfing - Men's Quarterfinals - Heat 3\n🇧🇷 Gabriel MEDINA
+SUMMARY:🏄 Men's Quarterfinals - Heat 3
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T184800Z-boxing-MENS-80KG-PRELIMINARIES-ROUND-OF-16-HAI-BRA
 DTSTAMP:20240730T184800Z
 DTSTART:20240730T184800Z
diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index 44f487fa0..b7451521b 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -1951,12 +1951,12 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8
+UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8-CHN-GBR
 DTSTAMP:20240730T123000Z
 DTSTART:20240730T123000Z
 DTEND:20240730T124600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇨🇳 CHN
-SUMMARY:🏉 Women's Placing 5-8
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+SUMMARY:🏉 CHN 🇨🇳 - 🇬🇧 GBR
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/GBR.ics b/docs/general/GBR.ics
index 9527750de..afefe5b7a 100644
--- a/docs/general/GBR.ics
+++ b/docs/general/GBR.ics
@@ -1441,6 +1441,15 @@ SUMMARY:⛵ Men's Windsurfing - Race 6
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8-CHN-GBR
+DTSTAMP:20240730T123000Z
+DTSTART:20240730T123000Z
+DTEND:20240730T124600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+SUMMARY:🏉 CHN 🇨🇳 - 🇬🇧 GBR
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T123500Z-sailing-MENS-SKIFF-RACE-7
 DTSTAMP:20240730T123500Z
 DTSTART:20240730T123500Z
diff --git a/docs/general/MAR.ics b/docs/general/MAR.ics
index 93925e997..ee2ed0730 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-BRA-MAR
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
+SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/NZL.ics b/docs/general/NZL.ics
index 88ac344e7..7447ede66 100644
--- a/docs/general/NZL.ics
+++ b/docs/general/NZL.ics
@@ -1095,12 +1095,12 @@ SUMMARY:⛵ Men's Skiff - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL
+UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL-NZL-USA
 DTSTAMP:20240730T133000Z
 DTSTART:20240730T133000Z
 DTEND:20240730T134600Z
-DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇳🇿 NZL
-SUMMARY:🏉 Women's Semi-final
+DESCRIPTION:Rugby Sevens - Women's Semi-final
+SUMMARY:🏉 NZL 🇳🇿 - 🇺🇸 USA
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 3f64e292a..372c425eb 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -2460,6 +2460,15 @@ SUMMARY:⛵ Men's Skiff - Race 8
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
+UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL-NZL-USA
+DTSTAMP:20240730T133000Z
+DTSTART:20240730T133000Z
+DTEND:20240730T134600Z
+DESCRIPTION:Rugby Sevens - Women's Semi-final
+SUMMARY:🏉 NZL 🇳🇿 - 🇺🇸 USA
+LOCATION:Stade de France
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T141900Z-sailing-MENS-SKIFF-RACE-9
 DTSTAMP:20240730T141900Z
 DTSTART:20240730T141900Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index cba94b499..0cde500ea 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-BRA-MAR
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
+SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -12932,12 +12932,12 @@ SUMMARY:🏹 Women's Individual 1/16 Elimination Round
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8
+UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8-CHN-GBR
 DTSTAMP:20240730T123000Z
 DTSTART:20240730T123000Z
 DTEND:20240730T124600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇨🇳 CHN
-SUMMARY:🏉 Women's Placing 5-8
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+SUMMARY:🏉 CHN 🇨🇳 - 🇬🇧 GBR
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
@@ -13179,12 +13179,12 @@ SUMMARY:🥊 Nijat HUSEYNOV 🇦🇿 - 🇩🇴 Yunior ALCANTARA REYES
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL
+UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL-NZL-USA
 DTSTAMP:20240730T133000Z
 DTSTART:20240730T133000Z
 DTEND:20240730T134600Z
-DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇳🇿 NZL
-SUMMARY:🏉 Women's Semi-final
+DESCRIPTION:Rugby Sevens - Women's Semi-final
+SUMMARY:🏉 NZL 🇳🇿 - 🇺🇸 USA
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
@@ -14003,7 +14003,7 @@ UID:20240730T181200Z-surfing-MENS-QUARTERFINALS-HEAT-3
 DTSTAMP:20240730T181200Z
 DTSTART:20240730T181200Z
 DTEND:20240730T184200Z
-DESCRIPTION:Surfing - Men's Quarterfinals - Heat 3
+DESCRIPTION:Surfing - Men's Quarterfinals - Heat 3\n🇧🇷 Gabriel MEDINA
 SUMMARY:🏄 Men's Quarterfinals - Heat 3
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
@@ -22063,7 +22063,7 @@ UID:20240802T202400Z-boxing-MENS-92KG-QUARTERFINAL
 DTSTAMP:20240802T202400Z
 DTSTART:20240802T202400Z
 DTEND:20240802T203500Z
-DESCRIPTION:Boxing - Men's +92kg - Quarterfinal
+DESCRIPTION:Boxing - Men's +92kg - Quarterfinal\n🇦🇲 Davit CHALOYAN
 SUMMARY:🥊 Men's +92kg - Quarterfinal
 LOCATION:North Paris Arena
 END:VEVENT
diff --git a/docs/rugby-sevens/CHN.ics b/docs/rugby-sevens/CHN.ics
index 004baf19a..d8cfb223f 100644
--- a/docs/rugby-sevens/CHN.ics
+++ b/docs/rugby-sevens/CHN.ics
@@ -40,12 +40,12 @@ SUMMARY:🏉 NZL 🇳🇿 - 🇨🇳 CHN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8
+UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8-CHN-GBR
 DTSTAMP:20240730T123000Z
 DTSTART:20240730T123000Z
 DTEND:20240730T124600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇨🇳 CHN
-SUMMARY:🏉 Women's Placing 5-8
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+SUMMARY:🏉 CHN 🇨🇳 - 🇬🇧 GBR
 LOCATION:Stade de France
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/rugby-sevens/GBR.ics b/docs/rugby-sevens/GBR.ics
index 9a623af55..3d6e9eb6a 100644
--- a/docs/rugby-sevens/GBR.ics
+++ b/docs/rugby-sevens/GBR.ics
@@ -39,4 +39,13 @@ DESCRIPTION:Rugby Sevens - Women's Quarter-final
 SUMMARY:🏉 GBR 🇬🇧 - 🇺🇸 USA
 LOCATION:Stade de France
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8-CHN-GBR
+DTSTAMP:20240730T123000Z
+DTSTART:20240730T123000Z
+DTEND:20240730T124600Z
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+SUMMARY:🏉 CHN 🇨🇳 - 🇬🇧 GBR
+LOCATION:Stade de France
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/rugby-sevens/NZL.ics b/docs/rugby-sevens/NZL.ics
index 74dc23a2a..323cad085 100644
--- a/docs/rugby-sevens/NZL.ics
+++ b/docs/rugby-sevens/NZL.ics
@@ -94,12 +94,12 @@ SUMMARY:🏉 NZL 🇳🇿 - 🇨🇳 CHN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL
+UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL-NZL-USA
 DTSTAMP:20240730T133000Z
 DTSTART:20240730T133000Z
 DTEND:20240730T134600Z
-DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇳🇿 NZL
-SUMMARY:🏉 Women's Semi-final
+DESCRIPTION:Rugby Sevens - Women's Semi-final
+SUMMARY:🏉 NZL 🇳🇿 - 🇺🇸 USA
 LOCATION:Stade de France
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/rugby-sevens/USA.ics b/docs/rugby-sevens/USA.ics
index 6556033db..5af3edfe8 100644
--- a/docs/rugby-sevens/USA.ics
+++ b/docs/rugby-sevens/USA.ics
@@ -93,4 +93,13 @@ DESCRIPTION:Rugby Sevens - Women's Quarter-final
 SUMMARY:🏉 GBR 🇬🇧 - 🇺🇸 USA
 LOCATION:Stade de France
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL-NZL-USA
+DTSTAMP:20240730T133000Z
+DTSTART:20240730T133000Z
+DTEND:20240730T134600Z
+DESCRIPTION:Rugby Sevens - Women's Semi-final
+SUMMARY:🏉 NZL 🇳🇿 - 🇺🇸 USA
+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 f925beb46..b640501c5 100644
--- a/docs/rugby-sevens/general.ics
+++ b/docs/rugby-sevens/general.ics
@@ -526,12 +526,12 @@ SUMMARY:🏉 AUS 🇦🇺 - 🇮🇪 IRL
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8
+UID:20240730T123000Z-rugby-sevens-WOMENS-PLACING-5-8-CHN-GBR
 DTSTAMP:20240730T123000Z
 DTSTART:20240730T123000Z
 DTEND:20240730T124600Z
-DESCRIPTION:Rugby Sevens - Women's Placing 5-8\n🇨🇳 CHN
-SUMMARY:🏉 Women's Placing 5-8
+DESCRIPTION:Rugby Sevens - Women's Placing 5-8
+SUMMARY:🏉 CHN 🇨🇳 - 🇬🇧 GBR
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
@@ -544,12 +544,12 @@ SUMMARY:🏉 Women's Placing 5-8
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL
+UID:20240730T133000Z-rugby-sevens-WOMENS-SEMI-FINAL-NZL-USA
 DTSTAMP:20240730T133000Z
 DTSTART:20240730T133000Z
 DTEND:20240730T134600Z
-DESCRIPTION:Rugby Sevens - Women's Semi-final\n🇳🇿 NZL
-SUMMARY:🏉 Women's Semi-final
+DESCRIPTION:Rugby Sevens - Women's Semi-final
+SUMMARY:🏉 NZL 🇳🇿 - 🇺🇸 USA
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/BRA.ics b/docs/surfing/BRA.ics
index 686f90158..3c67e4511 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-BRA-MAR
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
+SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -125,4 +125,13 @@ DESCRIPTION:Surfing - Women's Round 3 - Heat 7
 SUMMARY:🏄 Luana SILVA 🇧🇷 - 🇧🇷 Taina HINCKEL
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
+BEGIN:VEVENT
+UID:20240730T181200Z-surfing-MENS-QUARTERFINALS-HEAT-3
+DTSTAMP:20240730T181200Z
+DTSTART:20240730T181200Z
+DTEND:20240730T184200Z
+DESCRIPTION:Surfing - Men's Quarterfinals - Heat 3\n🇧🇷 Gabriel MEDINA
+SUMMARY:🏄 Men's Quarterfinals - Heat 3
+LOCATION:Teahupo'o, Tahiti
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/surfing/MAR.ics b/docs/surfing/MAR.ics
index 509f9bf7b..f65b9cfab 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-BRA-MAR
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
+SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
 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 bb27cc978..4ff46796b 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-BRA-MAR
+UID:20240729T200000Z-surfing-MENS-ROUND-3-HEAT-6-MAR-BRA
 DTSTAMP:20240729T200000Z
 DTSTART:20240729T200000Z
 DTEND:20240729T203000Z
 DESCRIPTION:Surfing - Men's Round 3 - Heat 6
-SUMMARY:🏄 Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM
+SUMMARY:🏄 Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -474,7 +474,7 @@ UID:20240730T181200Z-surfing-MENS-QUARTERFINALS-HEAT-3
 DTSTAMP:20240730T181200Z
 DTSTART:20240730T181200Z
 DTEND:20240730T184200Z
-DESCRIPTION:Surfing - Men's Quarterfinals - Heat 3
+DESCRIPTION:Surfing - Men's Quarterfinals - Heat 3\n🇧🇷 Gabriel MEDINA
 SUMMARY:🏄 Men's Quarterfinals - Heat 3
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 4e0e4bf7e..38ad12df7 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="BRA,MAR">
+<div class="event py-4" data-start="20240729T200000Z" data-end="20240729T203000Z" data-noc="MAR,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">
@@ -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="">Joao CHIANCA 🇧🇷 - 🇲🇦 Ramzi BOUKHIAM</div>
+   <div class="">Ramzi BOUKHIAM 🇲🇦 - 🇧🇷 Joao CHIANCA</div>
    </div>
  </div>
 </div>
@@ -19363,7 +19363,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T123000Z" data-end="20240730T124600Z" data-noc="CHN">
+<div class="event py-4" data-start="20240730T123000Z" data-end="20240730T124600Z" data-noc="CHN,GBR">
  <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">
@@ -19372,6 +19372,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's Placing 5-8
+   <div class="">CHN 🇨🇳 - 🇬🇧 GBR</div>
    </div>
  </div>
 </div>
@@ -19761,7 +19762,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T133000Z" data-end="20240730T134600Z" data-noc="NZL">
+<div class="event py-4" data-start="20240730T133000Z" data-end="20240730T134600Z" data-noc="NZL,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">
@@ -19770,6 +19771,7 @@
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
    <div class="">Women's Semi-final
+   <div class="">NZL 🇳🇿 - 🇺🇸 USA</div>
    </div>
  </div>
 </div>
@@ -20957,7 +20959,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240730T181200Z" data-end="20240730T184200Z" data-noc="">
+<div class="event py-4" data-start="20240730T181200Z" data-end="20240730T184200Z" data-noc="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">
@@ -20966,6 +20968,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 Quarterfinals - Heat 3
+<div class= "competitor BRA"> 🇧🇷 Gabriel MEDINA </div>
    </div>
  </div>
 </div>
@@ -32699,7 +32702,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240802T202400Z" data-end="20240802T203500Z" data-noc="">
+<div class="event py-4" data-start="20240802T202400Z" data-end="20240802T203500Z" data-noc="ARM">
  <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">
@@ -32709,6 +32712,7 @@
    </div>
    <div class="">Men's +92kg - Quarterfinal
    <div class="">Men's +92kg - Quarterfinal</div>
+<div class= "competitor ARM"> 🇦🇲 Davit CHALOYAN </div>
    </div>
  </div>
 </div>