diff --git a/components/Flag.vue b/components/Flag.vue
index 7a488dcd..e51a421e 100644
--- a/components/Flag.vue
+++ b/components/Flag.vue
@@ -15,7 +15,7 @@
             name: { required: true },
             alt: { required: true },
             img: { required: true },
-            terms: { 'default': [] },
+            terms: { },
         },
         computed: {
             link() {
@@ -23,7 +23,7 @@
                     return null;
                 }
 
-                for (let term of this.terms) {
+                for (let term of this.terms || []) {
                     if (term.term.toLowerCase().includes(this.name.toLowerCase())) {
                         return this.name;
                     }
diff --git a/locale/es/translations.suml b/locale/es/translations.suml
index 466511c6..613f07bb 100644
--- a/locale/es/translations.suml
+++ b/locale/es/translations.suml
@@ -476,6 +476,7 @@ flags:
     Demisexual: 'Demisexual'
     Diamoric: 'Diamóri{inflection_c}'
     Enbian: 'Nobian{inflection}'
+    Fa*afafine: 'Fa''afafine'
     Gay: 'Gay'
     Gender_Questioning: 'Cuestionándose el género'
     Genderfae: 'Hadagénero'
@@ -486,11 +487,15 @@ flags:
     Greyasexual: 'Grissexual'
     Greyaromantic: 'Grisrrománti{inflection_c}'
     Gynesexual: 'Ginosexual'
+    Heteroflexible: 'Heteroflexible'
+    Hijra: 'Hijra'
+    Homoflexible: 'Homoflexible'
     Intersex: 'Intersexual'
     LGBTQ: 'LGBTQ'
     Leather_Pride: 'Orgullo cuero'
     Lesbian: 'Lesbiana'
     Maverique: 'Maverique'
+    Muxe: 'Muxe'
     Nebularomantic: 'Nebulosarrománti{inflection_c}'
     Neopronouns: 'Neopronombres'
     Neutrois: 'Neutr{inflection}'
@@ -508,6 +513,7 @@ flags:
     Queerplatonic: 'Queerplatóni{inflection_c}'
     Quoiromantic: 'Queerrománti{inflection_c}'
     Sapphic: 'Sáfi{inflection_c}'
+    Sexuality_Questioning: 'Cuestionándose la sexualidad'
     Straight_Ally: 'Aliad{inflection} hetero'
     Toric: 'Tóri{inflection_c}'
     Transfeminine: 'Transfemenin{inflection}'
@@ -516,4 +522,5 @@ flags:
     Transneutral: 'Transneutr{inflection}'
     Trigender: 'Trigénero'
     Trixic: 'Tríci{inflection_c}'
+    Two_Spirit: 'Dos espíritus'
     Xenogender: 'Xenogénero'
diff --git a/locale/pl/translations.suml b/locale/pl/translations.suml
index 05da3199..7bbe1c29 100644
--- a/locale/pl/translations.suml
+++ b/locale/pl/translations.suml
@@ -1022,6 +1022,7 @@ flags:
     Demisexual: 'Demiseksualn{adjective_n}'
     Diamoric: 'Diamoryczn{adjective_n}'
     Enbian: 'Enbiańsk{adjective_n_alt}'  # Niebiańsk{adjective_n}
+    Fa*afafine: 'Fa''afafine'
     Gay: 'Gej'
     Gender_Questioning: 'Rozważając{adjective_n} swoją płeć'  # Zastanawiając{adjective_n} się nad swoją płcią
     Genderfae: 'Nimficzn{adjective_n}'
@@ -1032,11 +1033,15 @@ flags:
     Greyasexual: 'Szaroaseksualn{adjective_n}'
     Greyaromantic: 'Szaroaromantyczn{adjective_n}'
     Gynesexual: 'Gyneseksualn{adjective_n}'
+    Heteroflexible: 'Heteroelastyczn{adjective_n}'
+    Hijra: 'Hidźra'
+    Homoflexible: 'Homoelastyczn{adjective_n}'
     Intersex: 'Interpłciow{adjective_n}'
     LGBTQ: 'LGBTQ'
     Leather_Pride: 'Skórzak'
     Lesbian: 'Lesbijka'
     Maverique: 'Maweryczn{adjective_n}'
+    Muxe: 'Muxe'
     Nebularomantic: 'Mgławicoromantyczn{adjective_n}'
     Neopronouns: 'Neozaimki'
     Neutrois: 'Neutralnopłciow{adjective_n}'
@@ -1054,6 +1059,7 @@ flags:
     Queerplatonic: 'Queerplatoniczn{adjective_n}'
     Quoiromantic: 'Quoiromantyczn{adjective_n}'  # Jakromantyczn{adjective_n}
     Sapphic: 'Safick{adjective_n_alt}'  # Safik, Sapphic
+    Sexuality_Questioning: 'Rozważając{adjective_n} swoją orientację'
     Straight_Ally: 'Hetero osoba sojusznicza'
     Toric: 'Toryczn{adjective_n}'
     Transfeminine: 'Transkobiec{adjective_n}'
@@ -1062,4 +1068,5 @@ flags:
     Transneutral: 'Transneutraln{adjective_n}'
     Trigender: 'Tripłciow{adjective_n}'  # Trójpłciow{adjective_n}
     Trixic: 'Triksyjsk{adjective_n_alt}'
+    Two_Spirit: 'Dwie dusze'
     Xenogender: 'Ksenopłciow{adjective_n}'
diff --git a/plugins/globals.js b/plugins/globals.js
index ba869901..bca129fc 100644
--- a/plugins/globals.js
+++ b/plugins/globals.js
@@ -8,7 +8,7 @@ export default ({ app }) => {
     Vue.prototype.$t = t;
     Vue.prototype.$translateForPronoun = (str, pronoun) =>
         pronoun.format(
-            t(`flags.${str.replace(/ /g, '_')}`, {}, false) || str
+            t(`flags.${str.replace(/ /g, '_').replace(/\*/g, `'`)}`, {}, false) || str
         );
     Vue.prototype.config = config;
     Vue.prototype.locales = buildDict(function* () {
diff --git a/static/flags/Fa'afafine.png b/static/flags/Fa'afafine.png
new file mode 100644
index 00000000..865f95cc
Binary files /dev/null and b/static/flags/Fa'afafine.png differ
diff --git a/static/flags/Heteroflexible.png b/static/flags/Heteroflexible.png
new file mode 100644
index 00000000..96060a30
Binary files /dev/null and b/static/flags/Heteroflexible.png differ
diff --git a/static/flags/Hijra.png b/static/flags/Hijra.png
new file mode 100644
index 00000000..27790fbf
Binary files /dev/null and b/static/flags/Hijra.png differ
diff --git a/static/flags/Homoflexible.png b/static/flags/Homoflexible.png
new file mode 100644
index 00000000..c9f074a6
Binary files /dev/null and b/static/flags/Homoflexible.png differ
diff --git a/static/flags/Muxe.png b/static/flags/Muxe.png
new file mode 100644
index 00000000..f34f7fd8
Binary files /dev/null and b/static/flags/Muxe.png differ
diff --git a/static/flags/Sexuality Questioning.png b/static/flags/Sexuality Questioning.png
new file mode 100644
index 00000000..28e28d0a
Binary files /dev/null and b/static/flags/Sexuality Questioning.png differ
diff --git a/static/flags/Two Spirit.png b/static/flags/Two Spirit.png
new file mode 100644
index 00000000..e5424f2b
Binary files /dev/null and b/static/flags/Two Spirit.png differ