diff --git a/docs/en/boccia/INA.ics b/docs/en/boccia/INA.ics
index 0367eae04..b19feb290 100644
--- a/docs/en/boccia/INA.ics
+++ b/docs/en/boccia/INA.ics
@@ -175,12 +175,12 @@ SUMMARY: Muhamad SYAFA 🇮🇩 - 🇬🇧 David SMITH
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/THA.ics b/docs/en/boccia/THA.ics
index 667a441c9..86bd29304 100644
--- a/docs/en/boccia/THA.ics
+++ b/docs/en/boccia/THA.ics
@@ -265,12 +265,12 @@ SUMMARY: Watcharaphon VONGSA 🇹🇭 - 🇸🇰 Robert MEZIK
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/general.ics b/docs/en/boccia/general.ics
index 4cb983111..86fb2b73a 100644
--- a/docs/en/boccia/general.ics
+++ b/docs/en/boccia/general.ics
@@ -2065,12 +2065,12 @@ SUMMARY: JEONG Soyeong 🇰🇷 - 🇵🇹 Cristina GONCALVES
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/boccia/medals.ics b/docs/en/boccia/medals.ics
index 473e15e2e..8afac6e4d 100644
--- a/docs/en/boccia/medals.ics
+++ b/docs/en/boccia/medals.ics
@@ -85,12 +85,12 @@ SUMMARY: JEONG Soyeong 🇰🇷 - 🇵🇹 Cristina GONCALVES
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/BRA.ics b/docs/en/general/BRA.ics
index 573e6dda8..f9db27eba 100644
--- a/docs/en/general/BRA.ics
+++ b/docs/en/general/BRA.ics
@@ -2667,6 +2667,15 @@ SUMMARY: Chilchitparyak BOOTWANSIRINA 🇹🇭 - 🇧🇷 Carla AZEVEDO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
+DTSTAMP:20240902T191000Z
+DTSTART:20240902T191000Z
+DTEND:20240902T204000Z
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T073800Z-para-swimming-MENS-100M-BACKSTROKE-S9-HEATS
 DTSTAMP:20240903T073800Z
 DTSTART:20240903T073800Z
diff --git a/docs/en/general/FRA.ics b/docs/en/general/FRA.ics
index d9c837e67..907be6341 100644
--- a/docs/en/general/FRA.ics
+++ b/docs/en/general/FRA.ics
@@ -2597,6 +2597,15 @@ SUMMARY: Maksym CHUDZICKI 🇵🇱 - 🇫🇷 Clement BERTHIER
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
+DTSTAMP:20240902T191000Z
+DTSTART:20240902T191000Z
+DTEND:20240902T204000Z
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240903T070000Z-para-archery-WOMENS-INDIVIDUAL-RECURVE-OPEN-116-ELIMIN
 DTSTAMP:20240903T070000Z
 DTSTART:20240903T070000Z
diff --git a/docs/en/general/GBR.ics b/docs/en/general/GBR.ics
index 36281be97..0e2f520d6 100644
--- a/docs/en/general/GBR.ics
+++ b/docs/en/general/GBR.ics
@@ -2611,13 +2611,12 @@ SUMMARY:Men's Singles - MS8 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match\n🇬🇧
-  Krysten COOMBS
-SUMMARY:Men's Singles SH6 Gold Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/HKG.ics b/docs/en/general/HKG.ics
index 0755748e9..5c6d5d568 100644
--- a/docs/en/general/HKG.ics
+++ b/docs/en/general/HKG.ics
@@ -518,13 +518,12 @@ SUMMARY: KAJIWARA Daiki 🇯🇵 - 🇭🇰 CHAN Ho Yuen
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match\n🇭🇰 CHU
-  Man Kai
-SUMMARY:Men's Singles SH6 Bronze Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/INA.ics b/docs/en/general/INA.ics
index 553a87483..9ec919add 100644
--- a/docs/en/general/INA.ics
+++ b/docs/en/general/INA.ics
@@ -776,12 +776,12 @@ SUMMARY: Khalimatus SADIYAH 🇮🇩 - 🇮🇩 Leani Ratri OKTILA
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/THA.ics b/docs/en/general/THA.ics
index 8866820a6..433d25a1f 100644
--- a/docs/en/general/THA.ics
+++ b/docs/en/general/THA.ics
@@ -1345,12 +1345,12 @@ SUMMARY: Dararat ASAYUT 🇹🇭 - 🇧🇷 Marliane SANTOS
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/general/general.ics b/docs/en/general/general.ics
index 409333148..ad6a3801a 100644
--- a/docs/en/general/general.ics
+++ b/docs/en/general/general.ics
@@ -12560,12 +12560,12 @@ SUMMARY: Sonalben PATEL 🇮🇳 - 🇭🇷 Andela MUZINIC VINCETIC
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
@@ -14908,23 +14908,21 @@ SUMMARY:Men's Singles - MS8 - Round of 16
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match\n🇭🇰 CHU
-  Man Kai
-SUMMARY:Men's Singles SH6 Bronze Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match\n🇬🇧
-  Krysten COOMBS
-SUMMARY:Men's Singles SH6 Gold Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/BRA.ics b/docs/en/medals/BRA.ics
index f9e2123ea..4a8114eba 100644
--- a/docs/en/medals/BRA.ics
+++ b/docs/en/medals/BRA.ics
@@ -683,6 +683,15 @@ SUMMARY:Men's Shot Put - F11 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
+DTSTAMP:20240902T191000Z
+DTSTART:20240902T191000Z
+DTEND:20240902T204000Z
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T100000Z-wheelchair-tennis-QUAD-DOUBLES-BRONZE-MEDAL-MATCH-RSA-
 DTSTAMP:20240904T100000Z
 DTSTART:20240904T100000Z
diff --git a/docs/en/medals/FRA.ics b/docs/en/medals/FRA.ics
index f6915db3f..0cfbf66fc 100644
--- a/docs/en/medals/FRA.ics
+++ b/docs/en/medals/FRA.ics
@@ -604,6 +604,15 @@ SUMMARY: Suhas L.Y. 🇮🇳 - 🇫🇷 Lucas MAZUR
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
+DTSTAMP:20240902T191000Z
+DTSTART:20240902T191000Z
+DTEND:20240902T204000Z
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
+LOCATION:La Chapelle Arena
+END:VEVENT
+BEGIN:VEVENT
 UID:20240904T100000Z-para-powerlifting-MENS-UP-TO-49KG-FINAL
 DTSTAMP:20240904T100000Z
 DTSTART:20240904T100000Z
diff --git a/docs/en/medals/GBR.ics b/docs/en/medals/GBR.ics
index a9ae49f0f..8d125c8b8 100644
--- a/docs/en/medals/GBR.ics
+++ b/docs/en/medals/GBR.ics
@@ -766,13 +766,12 @@ SUMMARY: Edilson CHICA CHICA 🇨🇴 - 🇬🇧 Stephen McGUIRE
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match\n🇬🇧
-  Krysten COOMBS
-SUMMARY:Men's Singles SH6 Gold Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/HKG.ics b/docs/en/medals/HKG.ics
index f8e15ee6f..4ec728e00 100644
--- a/docs/en/medals/HKG.ics
+++ b/docs/en/medals/HKG.ics
@@ -98,13 +98,12 @@ SUMMARY: KAJIWARA Daiki 🇯🇵 - 🇭🇰 CHAN Ho Yuen
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match\n🇭🇰 CHU
-  Man Kai
-SUMMARY:Men's Singles SH6 Bronze Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
 LOCATION:La Chapelle Arena
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/medals/INA.ics b/docs/en/medals/INA.ics
index 4d85fdcc9..274c5b5a5 100644
--- a/docs/en/medals/INA.ics
+++ b/docs/en/medals/INA.ics
@@ -70,12 +70,12 @@ SUMMARY: Muhamad SYAFA 🇮🇩 - 🇬🇧 David SMITH
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/THA.ics b/docs/en/medals/THA.ics
index c1992cad0..f8fe43ac1 100644
--- a/docs/en/medals/THA.ics
+++ b/docs/en/medals/THA.ics
@@ -166,12 +166,12 @@ SUMMARY:Men's 400m - T54 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/medals/general.ics b/docs/en/medals/general.ics
index 3337725b0..da5129128 100644
--- a/docs/en/medals/general.ics
+++ b/docs/en/medals/general.ics
@@ -2438,12 +2438,12 @@ SUMMARY:Women's Long Jump - T37 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-INA-THA
+UID:20240901T184500Z-boccia-MENS-INDIVIDUAL-BC2-GOLD-MEDAL-MATCH-THA-INA
 DTSTAMP:20240901T184500Z
 DTSTART:20240901T184500Z
 DTEND:20240901T194500Z
 DESCRIPTION:Boccia - Men's Individual - BC2 Gold Medal Match
-SUMMARY: Muhammad Bintang HERLANGGA 🇮🇩 - 🇹🇭 Worawut SAENGAMPA
+SUMMARY: Worawut SAENGAMPA 🇹🇭 - 🇮🇩 Muhammad Bintang HERLANGGA
 LOCATION:South Paris Arena 1
 END:VEVENT
 BEGIN:VEVENT
@@ -3215,23 +3215,21 @@ SUMMARY:Men's Shot Put - F11 Final
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match\n🇭🇰 CHU
-  Man Kai
-SUMMARY:Men's Singles SH6 Bronze Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match\n🇬🇧
-  Krysten COOMBS
-SUMMARY:Men's Singles SH6 Gold Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/en/para-badminton/BRA.ics b/docs/en/para-badminton/BRA.ics
index 2b2487a3c..8fb7b2f99 100644
--- a/docs/en/para-badminton/BRA.ics
+++ b/docs/en/para-badminton/BRA.ics
@@ -93,4 +93,13 @@ DESCRIPTION:Para Badminton - Men's Singles SH6 Semifinal
 SUMMARY: Vitor TAVARES 🇧🇷 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
+DTSTAMP:20240902T191000Z
+DTSTART:20240902T191000Z
+DTEND:20240902T204000Z
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
+LOCATION:La Chapelle Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-badminton/FRA.ics b/docs/en/para-badminton/FRA.ics
index 5637cfef8..0f6be581b 100644
--- a/docs/en/para-badminton/FRA.ics
+++ b/docs/en/para-badminton/FRA.ics
@@ -270,4 +270,13 @@ DESCRIPTION:Para Badminton - Men's Singles SL4 Gold Medal Match
 SUMMARY: Suhas L.Y. 🇮🇳 - 🇫🇷 Lucas MAZUR
 LOCATION:La Chapelle Arena
 END:VEVENT
+BEGIN:VEVENT
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
+DTSTAMP:20240902T191000Z
+DTSTART:20240902T191000Z
+DTEND:20240902T204000Z
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
+LOCATION:La Chapelle Arena
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-badminton/GBR.ics b/docs/en/para-badminton/GBR.ics
index 146c55635..aa7b5599c 100644
--- a/docs/en/para-badminton/GBR.ics
+++ b/docs/en/para-badminton/GBR.ics
@@ -166,13 +166,12 @@ SUMMARY: Kumar NITESH 🇮🇳 - 🇬🇧 Daniel BETHELL
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match\n🇬🇧
-  Krysten COOMBS
-SUMMARY:Men's Singles SH6 Gold Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-badminton/HKG.ics b/docs/en/para-badminton/HKG.ics
index cd400dad9..8a05819dc 100644
--- a/docs/en/para-badminton/HKG.ics
+++ b/docs/en/para-badminton/HKG.ics
@@ -76,13 +76,12 @@ SUMMARY: KAJIWARA Daiki 🇯🇵 - 🇭🇰 CHAN Ho Yuen
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match\n🇭🇰 CHU
-  Man Kai
-SUMMARY:Men's Singles SH6 Bronze Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
 LOCATION:La Chapelle Arena
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-badminton/general.ics b/docs/en/para-badminton/general.ics
index 3c2a97914..909053017 100644
--- a/docs/en/para-badminton/general.ics
+++ b/docs/en/para-badminton/general.ics
@@ -2356,23 +2356,21 @@ SUMMARY:Women's Singles SH6 Gold Medal Match
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match\n🇭🇰 CHU
-  Man Kai
-SUMMARY:Men's Singles SH6 Bronze Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match\n🇬🇧
-  Krysten COOMBS
-SUMMARY:Men's Singles SH6 Gold Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/en/para-badminton/medals.ics b/docs/en/para-badminton/medals.ics
index 240dd2091..af928e20e 100644
--- a/docs/en/para-badminton/medals.ics
+++ b/docs/en/para-badminton/medals.ics
@@ -274,23 +274,21 @@ SUMMARY:Women's Singles SH6 Gold Medal Match
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-BRONZE-MEDAL-MATCH-HKG
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match\n🇭🇰 CHU
-  Man Kai
-SUMMARY:Men's Singles SH6 Bronze Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Bronze Medal Match
+SUMMARY: CHU Man Kai 🇭🇰 - 🇧🇷 Vitor TAVARES
 LOCATION:La Chapelle Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH
+UID:20240902T191000Z-para-badminton-MENS-SINGLES-SH6-GOLD-MEDAL-MATCH-GBR-F
 DTSTAMP:20240902T191000Z
 DTSTART:20240902T191000Z
 DTEND:20240902T204000Z
-DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match\n🇬🇧
-  Krysten COOMBS
-SUMMARY:Men's Singles SH6 Gold Medal Match
+DESCRIPTION:Para Badminton - Men's Singles SH6 Gold Medal Match
+SUMMARY: Krysten COOMBS 🇬🇧 - 🇫🇷 Charles NOAKES
 LOCATION:La Chapelle Arena
 END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/today.html b/docs/today.html
index 355394136..2949d40fe 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -27585,11 +27585,11 @@
    </div>
    <div>Men's Individual - BC2 Gold Medal Match</div>
     <div class="competitors">
-      Muhammad Bintang HERLANGGA
-      🇮🇩
-      -
-      🇹🇭
       Worawut SAENGAMPA
+      🇹🇭
+      -
+      🇮🇩
+      Muhammad Bintang HERLANGGA
     </div>
  </div>
 </div>
@@ -32303,7 +32303,7 @@
     <div class="competitor GBR">🇬🇧 Aaron McKIBBIN </div>
  </div>
 </div>
-<div class="event py-4 bg-orange-700" data-start="20240902T191000Z" data-end="20240902T204000Z" data-noc="HKG" >
+<div class="event py-4 bg-orange-700" data-start="20240902T191000Z" data-end="20240902T204000Z" data-noc="BRA,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">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -32315,10 +32315,16 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles SH6 Bronze Medal Match</div>
-    <div class="competitor HKG">🇭🇰 CHU Man Kai </div>
+    <div class="competitors">
+      CHU Man Kai
+      🇭🇰
+      -
+      🇧🇷
+      Vitor TAVARES
+    </div>
  </div>
 </div>
-<div class="event py-4 bg-amber-400" data-start="20240902T191000Z" data-end="20240902T204000Z" data-noc="GBR" >
+<div class="event py-4 bg-amber-400" data-start="20240902T191000Z" data-end="20240902T204000Z" data-noc="FRA,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">
   <span class="time-start">__:__</span>
   <div class="time-end text-xs">__:__</div>
@@ -32330,7 +32336,13 @@
    <span class="text-xs align-middle bg-blue-400 text-white py-1 px-2 rounded-xl">M</span>
    </div>
    <div>Men's Singles SH6 Gold Medal Match</div>
-    <div class="competitor GBR">🇬🇧 Krysten COOMBS </div>
+    <div class="competitors">
+      Krysten COOMBS
+      🇬🇧
+      -
+      🇫🇷
+      Charles NOAKES
+    </div>
  </div>
 </div>
 <div class="event py-4 " data-start="20240902T192500Z" data-end="20240902T194300Z" data-noc="AUS,CAN,CHN,GBR,JPN,KUW,SUI,THA,TUN,USA" >