diff --git a/docs/boxing/MEX.ics b/docs/boxing/MEX.ics
index 13be41b53..1fafdbc36 100644
--- a/docs/boxing/MEX.ics
+++ b/docs/boxing/MEX.ics
@@ -31,13 +31,12 @@ SUMMARY:🥊 Caitlin PARKER 🇦🇺 - 🇲🇽 Citlalli Vanessa ORTIZ
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16
+UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-MOZ-MEX
 DTSTAMP:20240731T192000Z
 DTSTART:20240731T192000Z
 DTEND:20240731T193100Z
-DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16\n🇲🇽 Marco
-  Alonso VERDE ALVAREZ
-SUMMARY:🥊 Men's 71kg - Preliminaries - Round of 16
+DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16
+SUMMARY:🥊 Tiago MUXANGA 🇲🇿 - 🇲🇽 Marco Alonso VERDE ALVAREZ
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/boxing/MOZ.ics b/docs/boxing/MOZ.ics
index eb4c81f46..99467204b 100644
--- a/docs/boxing/MOZ.ics
+++ b/docs/boxing/MOZ.ics
@@ -21,4 +21,13 @@ DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 32
 SUMMARY:🥊 Alcinda Lucas dos SANTOS 🇲🇿 - 🇸🇰 Triebelova JESSICA
 LOCATION:North Paris Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-MOZ-MEX
+DTSTAMP:20240731T192000Z
+DTSTART:20240731T192000Z
+DTEND:20240731T193100Z
+DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16
+SUMMARY:🥊 Tiago MUXANGA 🇲🇿 - 🇲🇽 Marco Alonso VERDE ALVAREZ
+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 535611278..fc4c0b2a6 100644
--- a/docs/boxing/general.ics
+++ b/docs/boxing/general.ics
@@ -1084,13 +1084,12 @@ SUMMARY:🥊 Jose Gabriel RODRIGUEZ TENORIO 🇪🇨 - 🇮🇳 NISHANT DEV
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16
+UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-MOZ-MEX
 DTSTAMP:20240731T192000Z
 DTSTART:20240731T192000Z
 DTEND:20240731T193100Z
-DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16\n🇲🇽 Marco
-  Alonso VERDE ALVAREZ
-SUMMARY:🥊 Men's 71kg - Preliminaries - Round of 16
+DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16
+SUMMARY:🥊 Tiago MUXANGA 🇲🇿 - 🇲🇽 Marco Alonso VERDE ALVAREZ
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/fencing/HUN.ics b/docs/fencing/HUN.ics
index b762f6aaa..79bec3e28 100644
--- a/docs/fencing/HUN.ics
+++ b/docs/fencing/HUN.ics
@@ -175,6 +175,16 @@ SUMMARY:🤺 KANO Koki 🇯🇵 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+DTSTAMP:20240728T192000Z
+DTSTART:20240728T192000Z
+DTEND:20240728T194500Z
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
+  ANDRASFI
+SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T070000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-64-VEN-HUN
 DTSTAMP:20240729T070000Z
 DTSTART:20240729T070000Z
diff --git a/docs/fencing/JPN.ics b/docs/fencing/JPN.ics
index 415d0262d..3200516a3 100644
--- a/docs/fencing/JPN.ics
+++ b/docs/fencing/JPN.ics
@@ -148,6 +148,15 @@ SUMMARY:🤺 KANO Koki 🇯🇵 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+DTSTAMP:20240728T201500Z
+DTSTART:20240728T201500Z
+DTEND:20240728T204000Z
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
+SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32-JPN-UKR
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index 9ac1a2413..0b665d5f0 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -1232,7 +1232,8 @@ UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
+  ANDRASFI
 SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
@@ -1250,7 +1251,7 @@ UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
 SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
@@ -1488,16 +1489,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 +1503,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 +1598,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 +1607,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/fencing/medals.ics b/docs/fencing/medals.ics
index ed64e5489..33a2ddbe2 100644
--- a/docs/fencing/medals.ics
+++ b/docs/fencing/medals.ics
@@ -53,7 +53,8 @@ UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
+  ANDRASFI
 SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
@@ -71,7 +72,7 @@ UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
 SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/general/HUN.ics b/docs/general/HUN.ics
index 4be865d68..51da39a8a 100644
--- a/docs/general/HUN.ics
+++ b/docs/general/HUN.ics
@@ -545,6 +545,16 @@ SUMMARY:🤺 KANO Koki 🇯🇵 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+DTSTAMP:20240728T192000Z
+DTSTART:20240728T192000Z
+DTEND:20240728T194500Z
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
+  ANDRASFI
+SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T070000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-64-VEN-HUN
 DTSTAMP:20240729T070000Z
 DTSTART:20240729T070000Z
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index 70ca02772..7f3a1d050 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -1018,12 +1018,12 @@ SUMMARY:🤺 KANO Koki 🇯🇵 - 🇭🇺 Tibor ANDRASFI
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-POR-JPN
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+SUMMARY:🏄 Teresa BONVALOT 🇵🇹 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -1069,6 +1069,15 @@ SUMMARY:🏸 WATANABE/HIGASHINO 🇯🇵 - 🇹🇼 YE/LEE
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+DTSTAMP:20240728T201500Z
+DTSTART:20240728T201500Z
+DTEND:20240728T204000Z
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
+SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240728T214800Z-surfing-MENS-ROUND-2-HEAT-1-ITA-JPN
 DTSTAMP:20240728T214800Z
 DTSTART:20240728T214800Z
diff --git a/docs/general/MEX.ics b/docs/general/MEX.ics
index c25e8690b..a9d77911b 100644
--- a/docs/general/MEX.ics
+++ b/docs/general/MEX.ics
@@ -725,13 +725,12 @@ SUMMARY:⛵ Women's Windsurfing - Race 15
 LOCATION:Marseille Marina
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16
+UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-MOZ-MEX
 DTSTAMP:20240731T192000Z
 DTSTART:20240731T192000Z
 DTEND:20240731T193100Z
-DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16\n🇲🇽 Marco
-  Alonso VERDE ALVAREZ
-SUMMARY:🥊 Men's 71kg - Preliminaries - Round of 16
+DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16
+SUMMARY:🥊 Tiago MUXANGA 🇲🇿 - 🇲🇽 Marco Alonso VERDE ALVAREZ
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/MOZ.ics b/docs/general/MOZ.ics
index 49be979cf..3bba86436 100644
--- a/docs/general/MOZ.ics
+++ b/docs/general/MOZ.ics
@@ -40,6 +40,15 @@ SUMMARY:🥊 Alcinda Lucas dos SANTOS 🇲🇿 - 🇸🇰 Triebelova JESSICA
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-MOZ-MEX
+DTSTAMP:20240731T192000Z
+DTSTART:20240731T192000Z
+DTEND:20240731T193100Z
+DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16
+SUMMARY:🥊 Tiago MUXANGA 🇲🇿 - 🇲🇽 Marco Alonso VERDE ALVAREZ
+LOCATION:North Paris Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240811T190000Z-closing-ceremony
 DTSTAMP:20240811T190000Z
 DTSTART:20240811T190000Z
diff --git a/docs/general/POR.ics b/docs/general/POR.ics
index 95fa56fd5..8a4ae2af1 100644
--- a/docs/general/POR.ics
+++ b/docs/general/POR.ics
@@ -196,12 +196,12 @@ SUMMARY:🚴 Women's Cross-country
 LOCATION:Elancourt Hill
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-POR-JPN
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+SUMMARY:🏄 Teresa BONVALOT 🇵🇹 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/general/general.ics b/docs/general/general.ics
index a8ca2aac2..1dd2ae4c3 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -7269,12 +7269,12 @@ SUMMARY:🏓 Lily ZHANG 🇺🇸 - 🇱🇧 Mariana SAHAKIAN
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-POR-JPN
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+SUMMARY:🏄 Teresa BONVALOT 🇵🇹 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
@@ -7585,7 +7585,8 @@ UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
+  ANDRASFI
 SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
@@ -7722,7 +7723,7 @@ UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
 SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
@@ -9169,16 +9170,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
@@ -9193,6 +9184,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
@@ -9593,8 +9594,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
@@ -9603,7 +9603,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
@@ -16982,13 +16983,12 @@ SUMMARY:🏊 Women's 1500m Freestyle Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16
+UID:20240731T192000Z-boxing-MENS-71KG-PRELIMINARIES-ROUND-OF-16-MOZ-MEX
 DTSTAMP:20240731T192000Z
 DTSTART:20240731T192000Z
 DTEND:20240731T193100Z
-DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16\n🇲🇽 Marco
-  Alonso VERDE ALVAREZ
-SUMMARY:🥊 Men's 71kg - Preliminaries - Round of 16
+DESCRIPTION:Boxing - Men's 71kg - Preliminaries - Round of 16
+SUMMARY:🥊 Tiago MUXANGA 🇲🇿 - 🇲🇽 Marco Alonso VERDE ALVAREZ
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/medals/HUN.ics b/docs/medals/HUN.ics
index 7606d82ec..c5838710a 100644
--- a/docs/medals/HUN.ics
+++ b/docs/medals/HUN.ics
@@ -84,6 +84,16 @@ SUMMARY:🥋 Reka PUPP 🇭🇺 - 🇫🇷 Amandine BUCHARD
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
+DTSTAMP:20240728T192000Z
+DTSTART:20240728T192000Z
+DTEND:20240728T194500Z
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
+  ANDRASFI
+SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240730T060000Z-triathlon-MENS-INDIVIDUAL
 DTSTAMP:20240730T060000Z
 DTSTART:20240730T060000Z
diff --git a/docs/medals/JPN.ics b/docs/medals/JPN.ics
index a690cff24..f236e06e0 100644
--- a/docs/medals/JPN.ics
+++ b/docs/medals/JPN.ics
@@ -87,6 +87,15 @@ SUMMARY:🏊 Women's 100m Butterfly Final
 LOCATION:Paris La Defense Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
+DTSTAMP:20240728T201500Z
+DTSTART:20240728T201500Z
+DTEND:20240728T204000Z
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
+SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T153000Z-artistic-gymnastics-MENS-TEAM-FINAL
 DTSTAMP:20240729T153000Z
 DTSTART:20240729T153000Z
diff --git a/docs/medals/general.ics b/docs/medals/general.ics
index d33c7c49d..ed5bd8847 100644
--- a/docs/medals/general.ics
+++ b/docs/medals/general.ics
@@ -400,7 +400,8 @@ UID:20240728T192000Z-fencing-MENS-PE-INDIVIDUAL-BRONZE-MEDAL-BOUT
 DTSTAMP:20240728T192000Z
 DTSTART:20240728T192000Z
 DTEND:20240728T194500Z
-DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Bronze Medal Bout\n🇭🇺 Tibor
+  ANDRASFI
 SUMMARY:🤺 Men's Épée Individual Bronze Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
@@ -429,7 +430,7 @@ UID:20240728T201500Z-fencing-MENS-PE-INDIVIDUAL-GOLD-MEDAL-BOUT
 DTSTAMP:20240728T201500Z
 DTSTART:20240728T201500Z
 DTEND:20240728T204000Z
-DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout
+DESCRIPTION:Fencing - Men's Épée Individual Gold Medal Bout\n🇯🇵 KANO Koki
 SUMMARY:🤺 Men's Épée Individual Gold Medal Bout
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/surfing/JPN.ics b/docs/surfing/JPN.ics
index 1c5606639..98dd1a050 100644
--- a/docs/surfing/JPN.ics
+++ b/docs/surfing/JPN.ics
@@ -44,12 +44,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-POR-JPN
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+SUMMARY:🏄 Teresa BONVALOT 🇵🇹 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/POR.ics b/docs/surfing/POR.ics
index 275324e6a..c5a884a08 100644
--- a/docs/surfing/POR.ics
+++ b/docs/surfing/POR.ics
@@ -24,12 +24,12 @@ SUMMARY:🏄 Women's Round 1 - Heat 8
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-POR-JPN
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+SUMMARY:🏄 Teresa BONVALOT 🇵🇹 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/surfing/general.ics b/docs/surfing/general.ics
index 4b05ece36..213f2e210 100644
--- a/docs/surfing/general.ics
+++ b/docs/surfing/general.ics
@@ -182,12 +182,12 @@ SUMMARY:🏄 Sarah BAUM 🇿🇦 - 🇩🇪 Camilla KEMP
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
-UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-JPN-POR
+UID:20240728T181200Z-surfing-WOMENS-ROUND-2-HEAT-3-POR-JPN
 DTSTAMP:20240728T181200Z
 DTSTART:20240728T181200Z
 DTEND:20240728T184200Z
 DESCRIPTION:Surfing - Women's Round 2 - Heat 3
-SUMMARY:🏄 MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+SUMMARY:🏄 Teresa BONVALOT 🇵🇹 - 🇯🇵 MATSUDA Shino
 LOCATION:Teahupo'o, Tahiti
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/today.html b/docs/today.html
index 3d54cb4f0..83fd729c8 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -10183,7 +10183,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T181200Z" data-end="20240728T184200Z" data-noc="JPN,POR">
+<div class="event py-4" data-start="20240728T181200Z" data-end="20240728T184200Z" data-noc="POR,JPN">
  <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">
@@ -10191,7 +10191,7 @@
    SURFING
    <span class="text-xs align-middle bg-pink-400 text-white py-1 px-2 rounded-xl">W</span>
    </div>
-   <div class="">MATSUDA Shino 🇯🇵 - 🇵🇹 Teresa BONVALOT
+   <div class="">Teresa BONVALOT 🇵🇹 - 🇯🇵 MATSUDA Shino
    </div>
  </div>
 </div>
@@ -10605,7 +10605,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T192000Z" data-end="20240728T194500Z" data-noc="">
+<div class="event py-4" data-start="20240728T192000Z" data-end="20240728T194500Z" data-noc="HUN">
  <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">
@@ -10614,6 +10614,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 Épée Individual Bronze Medal Bout
+<div class="competitor HUN">🇭🇺 Tibor ANDRASFI</div>
    </div>
  </div>
 </div>
@@ -10793,7 +10794,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T201500Z" data-end="20240728T204000Z" data-noc="">
+<div class="event py-4" data-start="20240728T201500Z" data-end="20240728T204000Z" data-noc="JPN">
  <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">
@@ -10802,6 +10803,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 Épée Individual Gold Medal Bout
+<div class="competitor JPN">🇯🇵 KANO Koki</div>
    </div>
  </div>
 </div>
@@ -12769,19 +12771,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">
@@ -12808,6 +12797,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">
@@ -13452,19 +13454,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">
@@ -13478,6 +13467,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">
@@ -23927,7 +23929,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240731T192000Z" data-end="20240731T193100Z" data-noc="MEX">
+<div class="event py-4" data-start="20240731T192000Z" data-end="20240731T193100Z" data-noc="MOZ,MEX">
  <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">
@@ -23935,8 +23937,7 @@
    BOXING
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
-   <div class="">Men's 71kg - Preliminaries - Round of 16
-<div class="competitor MEX">🇲🇽 Marco Alonso VERDE ALVAREZ</div>
+   <div class="">Tiago MUXANGA 🇲🇿 - 🇲🇽 Marco Alonso VERDE ALVAREZ
    </div>
  </div>
 </div>