diff --git a/common/annotations/en.xml b/common/annotations/en.xml
index 833fc5d3e3c..cde8f7664b0 100644
--- a/common/annotations/en.xml
+++ b/common/annotations/en.xml
@@ -1197,89 +1197,89 @@ annotations.
 		<annotation cp="🫦" type="tts">biting lip</annotation>
 		<annotation cp="👶">babies | baby | children | goo | infant | newborn | pregnant | young</annotation>
 		<annotation cp="👶" type="tts">baby</annotation>
-		<annotation cp="🧒">child | gender | gender-neutral | kid | unspecified | young</annotation>
+		<annotation cp="🧒">child | kid | young | younger | bright-eyed | grandchild</annotation>
 		<annotation cp="🧒" type="tts">child</annotation>
-		<annotation cp="👦">boy | child | kid | young</annotation>
+		<annotation cp="👦">boy | child | kid | young | younger | bright-eyed | son | grandson</annotation>
 		<annotation cp="👦" type="tts">boy</annotation>
-		<annotation cp="👧">bangs | bright-eyed | child | daughter | girl | lady | pigtails | Virgo | young | zodiac</annotation>
+		<annotation cp="👧">girl | child | kid | young | younger | bright-eyed | daughter | granddaughter | Virgo | zodiac</annotation>
 		<annotation cp="👧" type="tts">girl</annotation>
-		<annotation cp="🧑">adult | gender | gender-neutral | person | unspecified</annotation>
+		<annotation cp="🧑">adult | person</annotation>
 		<annotation cp="🧑" type="tts">person</annotation>
-		<annotation cp="👱">blond | blond-haired | blonde | dude | face | hair | human | man | person | person:</annotation>
+		<annotation cp="👱">blond | blond-haired | human | person</annotation>
 		<annotation cp="👱" type="tts">person: blond hair</annotation>
-		<annotation cp="👨">adult | boy | boyfriend | bro | friend | man</annotation>
+		<annotation cp="👨">adult | bro | man</annotation>
 		<annotation cp="👨" type="tts">man</annotation>
-		<annotation cp="🧔">beard | bearded | bewhiskered | person | person:</annotation>
+		<annotation cp="🧔">beard | bearded | whiskers | person</annotation>
 		<annotation cp="🧔" type="tts">person: beard</annotation>
-		<annotation cp="🧔‍♂">beard | man | man:</annotation>
+		<annotation cp="🧔‍♂">beard | bearded | whiskers | man</annotation>
 		<annotation cp="🧔‍♂" type="tts">man: beard</annotation>
-		<annotation cp="👱‍♂">blond | blond-haired | hair | man | man:</annotation>
+		<annotation cp="👱‍♂">blond | blond-haired | hair | man</annotation>
 		<annotation cp="👱‍♂" type="tts">man: blond hair</annotation>
-		<annotation cp="👩">adult | blonde | blondie | haircut | lady | woman</annotation>
+		<annotation cp="👩">adult | lady | woman</annotation>
 		<annotation cp="👩" type="tts">woman</annotation>
-		<annotation cp="🧔‍♀">beard | woman | woman:</annotation>
+		<annotation cp="🧔‍♀">beard | bearded | whiskers | woman</annotation>
 		<annotation cp="🧔‍♀" type="tts">woman: beard</annotation>
-		<annotation cp="👱‍♀">blond | blond-haired | blonde | hair | woman | woman:</annotation>
+		<annotation cp="👱‍♀">blond | blond-haired | blonde | hair | woman | woman</annotation>
 		<annotation cp="👱‍♀" type="tts">woman: blond hair</annotation>
-		<annotation cp="🧓">adult | gender | gender-neutral | old | older | person | unspecified</annotation>
+		<annotation cp="🧓">adult | elderly  | old | wise | grandparent | person</annotation>
 		<annotation cp="🧓" type="tts">older person</annotation>
-		<annotation cp="👴">adult | bald | dude | elderly | grandfather | grandpa | hair | losing | man | old | wise</annotation>
+		<annotation cp="👴">adult | elderly  | old | wise | grandfather | grandpa | gramps | bald | man</annotation>
 		<annotation cp="👴" type="tts">old man</annotation>
-		<annotation cp="👵">adult | bad | blond | blondie | grandma | grandmother | granny | haircut | lady | old | wise | woman</annotation>
+		<annotation cp="👵">adult | elderly  | old | wise | grandma | grandmother | granny | lady | woman</annotation>
 		<annotation cp="👵" type="tts">old woman</annotation>
-		<annotation cp="🙍">annoyed | disappoint | disgruntled | disturbed | frown | frowning | frustrated | gesture | happy | irritated | not | person | upset | woman</annotation>
+		<annotation cp="🙍">annoyed | disappointed | disgruntled | disturbed | frown | frowning | frustrated | gesture | irritated | upset | person</annotation>
 		<annotation cp="🙍" type="tts">person frowning</annotation>
-		<annotation cp="🙍‍♂">disgruntled | frown | frowning | gesture | man | upset</annotation>
+		<annotation cp="🙍‍♂">annoyed | disappointed | disgruntled | disturbed | frown | frowning | frustrated | gesture | irritated | upset | man</annotation>
 		<annotation cp="🙍‍♂" type="tts">man frowning</annotation>
-		<annotation cp="🙍‍♀">frowning | gesture | woman</annotation>
+		<annotation cp="🙍‍♀">annoyed | disappointed | disgruntled | disturbed | frown | frowning | frustrated | gesture | irritated | upset | woman</annotation>
 		<annotation cp="🙍‍♀" type="tts">woman frowning</annotation>
-		<annotation cp="🙎">disappoint | downtrodden | frown | gesture | grimace | person | pouting | scowl | sulk | upset | whine | woman</annotation>
+		<annotation cp="🙎">disappointed | downtrodden | frown | grimace | pouting | scowl | sulk | upset | whine | person</annotation>
 		<annotation cp="🙎" type="tts">person pouting</annotation>
-		<annotation cp="🙎‍♂">gesture | man | pouting</annotation>
+		<annotation cp="🙎‍♂">disappointed | downtrodden | frown | grimace | pouting | scowl | sulk | upset | whine | man</annotation>
 		<annotation cp="🙎‍♂" type="tts">man pouting</annotation>
-		<annotation cp="🙎‍♀">gesture | pouting | woman</annotation>
+		<annotation cp="🙎‍♀">disappointed | downtrodden | frown | grimace | pouting | scowl | sulk | upset | whine | woman</annotation>
 		<annotation cp="🙎‍♀" type="tts">woman pouting</annotation>
-		<annotation cp="🙅">chance | exclude | forbidden | gesture | gesturing | hand | no | NO | nope | not | person | prohibit | prohibited | woman</annotation>
+		<annotation cp="🙅">NO | forbidden | gesture | hand | prohibit | not | person</annotation>
 		<annotation cp="🙅" type="tts">person gesturing NO</annotation>
-		<annotation cp="🙅‍♂">forbidden | gesture | gesturing | hand | man | NO | no | nope | not | prohibited</annotation>
+		<annotation cp="🙅‍♂">NO | forbidden | gesture | hand | prohibit | not | man</annotation>
 		<annotation cp="🙅‍♂" type="tts">man gesturing NO</annotation>
-		<annotation cp="🙅‍♀">forbidden | gesture | gesturing | hand | NO | prohibited | woman</annotation>
+		<annotation cp="🙅‍♀">NO | forbidden | gesture | hand | prohibit | not | woman</annotation>
 		<annotation cp="🙅‍♀" type="tts">woman gesturing NO</annotation>
-		<annotation cp="🙆">exercise | gesture | gesturing | hand | OK | omg | person | woman</annotation>
+		<annotation cp="🙆">OK | gesture | gesturing | hand | exercise | omg | person</annotation>
 		<annotation cp="🙆" type="tts">person gesturing OK</annotation>
-		<annotation cp="🙆‍♂">exercise | gesture | gesturing | hand | man | OK | omg</annotation>
+		<annotation cp="🙆‍♂">OK | gesture | gesturing | hand | exercise | omg | man</annotation>
 		<annotation cp="🙆‍♂" type="tts">man gesturing OK</annotation>
-		<annotation cp="🙆‍♀">gesture | gesturing | hand | OK | woman</annotation>
+		<annotation cp="🙆‍♀">OK | gesture | gesturing | hand | exercise | omg | woman</annotation>
 		<annotation cp="🙆‍♀" type="tts">woman gesturing OK</annotation>
-		<annotation cp="💁">fetch | flick | flip | gossip | hair | hand | help | information | person | sarcasm | sarcastic | sassy | seriously | tipping | whatever | woman</annotation>
+		<annotation cp="💁">hand | sassy | tipping | fetch | flick | flip | gossip | sarcasm | sarcastic | seriously | whatever | person</annotation>
 		<annotation cp="💁" type="tts">person tipping hand</annotation>
-		<annotation cp="💁‍♂">fetch | flick | flip | gossip | hair | hand | help | information | man | sarcasm | sarcastic | sassy | tipping | whatever</annotation>
+		<annotation cp="💁‍♂">hand | sassy | tipping | fetch | flick | flip | gossip | sarcasm | sarcastic | seriously | whatever | man</annotation>
 		<annotation cp="💁‍♂" type="tts">man tipping hand</annotation>
-		<annotation cp="💁‍♀">hand | sassy | tipping | woman</annotation>
+		<annotation cp="💁‍♀">hand | sassy | tipping | fetch | flick | flip | gossip | sarcasm | sarcastic | seriously | whatever | woman</annotation>
 		<annotation cp="💁‍♀" type="tts">woman tipping hand</annotation>
-		<annotation cp="🙋">gesture | hand | happy | here | I | can | help | I | know | me | over | here | person | pick | question | raised | raising | right</annotation>
+		<annotation cp="🙋">gesture | hand | raising | here | know | I | me | pick | question | raise | person</annotation>
 		<annotation cp="🙋" type="tts">person raising hand</annotation>
-		<annotation cp="🙋‍♂">gesture | hand | hands | I | know | I | can | help | man | me | person | question | raised | raising</annotation>
+		<annotation cp="🙋‍♂">gesture | hand | raising | here | know | I | me | pick | question | raise | man</annotation>
 		<annotation cp="🙋‍♂" type="tts">man raising hand</annotation>
-		<annotation cp="🙋‍♀">gesture | hand | raising | woman</annotation>
+		<annotation cp="🙋‍♀">gesture | hand | raising | here | know | I | me | pick | question | raise | woman</annotation>
 		<annotation cp="🙋‍♀" type="tts">woman raising hand</annotation>
-		<annotation cp="🧏">accessibility | deaf | ear | hear | person</annotation>
+		<annotation cp="🧏">gesture | deaf | accessibility | ear | hear | person</annotation>
 		<annotation cp="🧏" type="tts">deaf person</annotation>
-		<annotation cp="🧏‍♂">deaf | man</annotation>
+		<annotation cp="🧏‍♂">gesture | deaf | accessibility | ear | hear | man</annotation>
 		<annotation cp="🧏‍♂" type="tts">deaf man</annotation>
-		<annotation cp="🧏‍♀">deaf | woman</annotation>
+		<annotation cp="🧏‍♀">gesture | deaf | accessibility | ear | hear | woman</annotation>
 		<annotation cp="🧏‍♀" type="tts">deaf woman</annotation>
-		<annotation cp="🙇">apology | beg | bow | bowing | forgive | gesture | man | meditate | meditation | person | pity | regret | sorry</annotation>
+		<annotation cp="🙇">ask | apology | bowing | gesture | sorry | beg | favor | bow | forgive | meditate | meditation | pity | regret | person</annotation>
 		<annotation cp="🙇" type="tts">person bowing</annotation>
-		<annotation cp="🙇‍♂">apology | bowing | favor | gesture | man | sorry</annotation>
+		<annotation cp="🙇‍♂">ask | apology | bowing | gesture | sorry | beg | favor | bow | forgive | meditate | meditation | pity | regret | man</annotation>
 		<annotation cp="🙇‍♂" type="tts">man bowing</annotation>
-		<annotation cp="🙇‍♀">apology | bow | bowing | favor | gesture | meditate | meditation | sorry | woman</annotation>
+		<annotation cp="🙇‍♀">ask | apology | bowing | gesture | sorry | beg | favor | bow | forgive | meditate | meditation | pity | regret | woman</annotation>
 		<annotation cp="🙇‍♀" type="tts">woman bowing</annotation>
-		<annotation cp="🤦">again | disbelief | exasperation | face | facepalm | facepalming | no | not | oh | omg | palm | person | shock | smh</annotation>
+		<annotation cp="🤦">again | disbelief | exasperation | facepalm | bewilder | no | not | oh | omg | shock | smh | person</annotation>
 		<annotation cp="🤦" type="tts">person facepalming</annotation>
-		<annotation cp="🤦‍♂">again | disbelief | exasperation | facepalm | facepalming | man | no | not | oh | omg | shock | smh</annotation>
+		<annotation cp="🤦‍♂">again | disbelief | exasperation | facepalm | bewilder | no | not | oh | omg | shock | smh | man</annotation>
 		<annotation cp="🤦‍♂" type="tts">man facepalming</annotation>
-		<annotation cp="🤦‍♀">again | bewilder | disbelief | exasperation | facepalm | facepalming | no | not | oh | omg | shock | smh | woman</annotation>
+		<annotation cp="🤦‍♀">again | disbelief | exasperation | facepalm | bewilder | no | not | oh | omg | shock | smh | woman</annotation>
 		<annotation cp="🤦‍♀" type="tts">woman facepalming</annotation>
 		<annotation cp="🤷">doubt | dunno | I | guess | idk | ignorance | indifference | knows | maybe | person | shrug | shrugging | whatever | who</annotation>
 		<annotation cp="🤷" type="tts">person shrugging</annotation>
@@ -1341,19 +1341,19 @@ annotations.
 		<annotation cp="👨‍💼" type="tts">man office worker</annotation>
 		<annotation cp="👩‍💼">architect | business | manager | office | white-collar | woman | worker</annotation>
 		<annotation cp="👩‍💼" type="tts">woman office worker</annotation>
-		<annotation cp="🧑‍🔬">biologist | chemist | engineer | physicist | scientist</annotation>
+		<annotation cp="🧑‍🔬">biologist | chemist | engineer | physicist | scientist | mathematician</annotation>
 		<annotation cp="🧑‍🔬" type="tts">scientist</annotation>
 		<annotation cp="👨‍🔬">biologist | chemist | engineer | man | mathematician | physicist | scientist</annotation>
 		<annotation cp="👨‍🔬" type="tts">man scientist</annotation>
 		<annotation cp="👩‍🔬">biologist | chemist | engineer | mathematician | physicist | scientist | woman</annotation>
 		<annotation cp="👩‍🔬" type="tts">woman scientist</annotation>
-		<annotation cp="🧑‍💻">coder | developer | inventor | software | technologist</annotation>
+		<annotation cp="🧑‍💻">coder | developer | inventor | software | technologist | computer</annotation>
 		<annotation cp="🧑‍💻" type="tts">technologist</annotation>
 		<annotation cp="👨‍💻">coder | computer | developer | inventor | man | software | technologist</annotation>
 		<annotation cp="👨‍💻" type="tts">man technologist</annotation>
 		<annotation cp="👩‍💻">coder | computer | developer | inventor | software | technologist | woman</annotation>
 		<annotation cp="👩‍💻" type="tts">woman technologist</annotation>
-		<annotation cp="🧑‍🎤">actor | entertainer | rock | singer | star</annotation>
+		<annotation cp="🧑‍🎤">actor | entertainer | rock | singer | star | rockstar</annotation>
 		<annotation cp="🧑‍🎤" type="tts">singer</annotation>
 		<annotation cp="👨‍🎤">actor | entertainer | man | rock | rockstar | singer | star</annotation>
 		<annotation cp="👨‍🎤" type="tts">man singer</annotation>
@@ -1371,7 +1371,7 @@ annotations.
 		<annotation cp="👨‍✈" type="tts">man pilot</annotation>
 		<annotation cp="👩‍✈">pilot | plane | woman</annotation>
 		<annotation cp="👩‍✈" type="tts">woman pilot</annotation>
-		<annotation cp="🧑‍🚀">astronaut | rocket</annotation>
+		<annotation cp="🧑‍🚀">astronaut | rocket | space</annotation>
 		<annotation cp="🧑‍🚀" type="tts">astronaut</annotation>
 		<annotation cp="👨‍🚀">astronaut | man | rocket | space</annotation>
 		<annotation cp="👨‍🚀" type="tts">man astronaut</annotation>
@@ -1379,15 +1379,15 @@ annotations.
 		<annotation cp="👩‍🚀" type="tts">woman astronaut</annotation>
 		<annotation cp="🧑‍🚒">fire | firefighter | firetruck</annotation>
 		<annotation cp="🧑‍🚒" type="tts">firefighter</annotation>
-		<annotation cp="👨‍🚒">firefighter | firetruck | man</annotation>
+		<annotation cp="👨‍🚒">firefighter | firetruck | man | fire</annotation>
 		<annotation cp="👨‍🚒" type="tts">man firefighter</annotation>
-		<annotation cp="👩‍🚒">firefighter | firetruck | woman</annotation>
+		<annotation cp="👩‍🚒">firefighter | firetruck | woman | fire</annotation>
 		<annotation cp="👩‍🚒" type="tts">woman firefighter</annotation>
-		<annotation cp="👮">apprehend | arrest | citation | cop | law | officer | police | pulled | over | undercover</annotation>
+		<annotation cp="👮">cop | officer | police | apprehend | arrest | citation | law | over | pulled | undercover</annotation>
 		<annotation cp="👮" type="tts">police officer</annotation>
-		<annotation cp="👮‍♂">cop | man | officer | police</annotation>
+		<annotation cp="👮‍♂">cop | officer | police | apprehend | arrest | citation | law | over | pulled | undercover | man</annotation>
 		<annotation cp="👮‍♂" type="tts">man police officer</annotation>
-		<annotation cp="👮‍♀">apprehend | arrest | citation | cop | law | officer | police | pulled | undercover | woman</annotation>
+		<annotation cp="👮‍♀">cop | officer | police | apprehend | arrest | citation | law | over | pulled | undercover | woman</annotation>
 		<annotation cp="👮‍♀" type="tts">woman police officer</annotation>
 		<annotation cp="🕵">detective | sleuth | spy</annotation>
 		<annotation cp="🕵" type="tts">detective</annotation>
@@ -1395,25 +1395,25 @@ annotations.
 		<annotation cp="🕵‍♂" type="tts">man detective</annotation>
 		<annotation cp="🕵‍♀">detective | sleuth | spy | woman</annotation>
 		<annotation cp="🕵‍♀" type="tts">woman detective</annotation>
-		<annotation cp="💂">buckingham | guard | guardsman | helmet | london | palace</annotation>
+		<annotation cp="💂">guard | buckingham | helmet | london | palace</annotation>
 		<annotation cp="💂" type="tts">guard</annotation>
-		<annotation cp="💂‍♂">guard | man</annotation>
+		<annotation cp="💂‍♂">guard | buckingham | helmet | london | palace | man</annotation>
 		<annotation cp="💂‍♂" type="tts">man guard</annotation>
-		<annotation cp="💂‍♀">buckingham | guard | helmet | london | palace | woman</annotation>
+		<annotation cp="💂‍♀">guard | buckingham | helmet | london | palace | woman</annotation>
 		<annotation cp="💂‍♀" type="tts">woman guard</annotation>
 		<annotation cp="🥷">assassin | fight | fighter | hidden | ninja | person | secret | skills | sly | soldier | stealth | war</annotation>
 		<annotation cp="🥷" type="tts">ninja</annotation>
-		<annotation cp="👷">build | construction | fix | hardhat | hat | helmet | man | person | rebuild | remodel | repair | work | worker</annotation>
+		<annotation cp="👷">construction | worker | build | fix | hardhat | hat | man | rebuild | remodel | repair | work | person</annotation>
 		<annotation cp="👷" type="tts">construction worker</annotation>
-		<annotation cp="👷‍♂">construction | man | worker</annotation>
+		<annotation cp="👷‍♂">construction | worker | build | fix | hardhat | hat | man | rebuild | remodel | repair | work | man</annotation>
 		<annotation cp="👷‍♂" type="tts">man construction worker</annotation>
-		<annotation cp="👷‍♀">construction | hardhat | hat | helmet | woman | work | worker</annotation>
+		<annotation cp="👷‍♀">construction | worker | build | fix | hardhat | hat | man | rebuild | remodel | repair | work | woman</annotation>
 		<annotation cp="👷‍♀" type="tts">woman construction worker</annotation>
 		<annotation cp="🫅">crown | monarch | noble | person | regal | royal | royalty</annotation> <!-- 1FAC5 -->
 		<annotation cp="🫅" type="tts">person with crown</annotation>
-		<annotation cp="🤴">prince | royal | royalty</annotation>
+		<annotation cp="🤴">crown | fairy | fairytale | fantasy | prince | royal | royalty | king | tale</annotation>
 		<annotation cp="🤴" type="tts">prince</annotation>
-		<annotation cp="👸">crown | fairy | fairytale | fantasy | princess | queen | tale</annotation>
+		<annotation cp="👸">crown | fairy | fairytale | fantasy | princess | royal | royalty | queen | tale</annotation>
 		<annotation cp="👸" type="tts">princess</annotation>
 		<annotation cp="👳">person | turban | wearing</annotation>
 		<annotation cp="👳" type="tts">person wearing turban</annotation>
@@ -1425,18 +1425,17 @@ annotations.
 		<annotation cp="👲" type="tts">person with skullcap</annotation>
 		<annotation cp="🧕">bandana | head | headscarf | hijab | kerchief | mantilla | tichel | woman</annotation>
 		<annotation cp="🧕" type="tts">woman with headscarf</annotation>
-		<annotation cp="🤵">formal | groom | person | tuxedo</annotation>
+		<annotation cp="🤵">formal | person | tuxedo | wedding</annotation>
 		<annotation cp="🤵" type="tts">person in tuxedo</annotation>
-		<!-- (more) Generated lines from Emoji Data v13, using GenerateCldrData.java -->
-		<annotation cp="🤵‍♂">man | in | tuxedo | tuxedo</annotation> <!-- 1F935 200D 2642 -->
+		<annotation cp="🤵‍♂">formal | groom | man | tuxedo | wedding</annotation> <!-- 1F935 200D 2642 -->
 		<annotation cp="🤵‍♂" type="tts">man in tuxedo</annotation>
-		<annotation cp="🤵‍♀">tuxedo | woman | in | tuxedo</annotation> <!-- 1F935 200D 2640 -->
+		<annotation cp="🤵‍♀">formal | woman | tuxedo | wedding</annotation> <!-- 1F935 200D 2640 -->
 		<annotation cp="🤵‍♀" type="tts">woman in tuxedo</annotation>
-		<annotation cp="👰">bride | person | veil | wedding</annotation>
+		<annotation cp="👰">veil | wedding | person</annotation>
 		<annotation cp="👰" type="tts">person with veil</annotation>
-		<annotation cp="👰‍♂">man | veil</annotation> <!-- 1F470 200D 2642 -->
+		<annotation cp="👰‍♂">veil | wedding | man</annotation> <!-- 1F470 200D 2642 -->
 		<annotation cp="👰‍♂" type="tts">man with veil</annotation>
-		<annotation cp="👰‍♀">veil | woman</annotation> <!-- 1F470 200D 2640 -->
+		<annotation cp="👰‍♀">veil | bride | wedding | woman</annotation> <!-- 1F470 200D 2640 -->
 		<annotation cp="👰‍♀" type="tts">woman with veil</annotation>
 		<annotation cp="🤰">pregnant | woman</annotation>
 		<annotation cp="🤰" type="tts">pregnant woman</annotation>
@@ -1444,109 +1443,109 @@ annotations.
 		<annotation cp="🫃" type="tts">pregnant man</annotation>
 		<annotation cp="🫄">belly | bloated | full | overeat | person | pregnant | stuffed</annotation> <!-- 1FAC4 -->
 		<annotation cp="🫄" type="tts">pregnant person</annotation>
-		<annotation cp="🤱">baby | breast | breast-feeding | feeding | nursing</annotation>
+		<annotation cp="🤱">baby | breast | breast-feeding | feeding | nursing | mother | mom | woman</annotation>
 		<annotation cp="🤱" type="tts">breast-feeding</annotation>
-		<annotation cp="👩‍🍼">baby | feed | feeding | love | mam | mammy | mom | mother | nanny | newborn | nursing | person | woman</annotation> <!-- 1F469 200D 1F37C -->
+		<annotation cp="👩‍🍼">baby | feed | feeding | nanny | newborn | nursing | mother | mom | woman</annotation> <!-- 1F469 200D 1F37C -->
 		<annotation cp="👩‍🍼" type="tts">woman feeding baby</annotation>
-		<annotation cp="👨‍🍼">baby | dad | father | feed | feeding | love | male | man | nanny | newborn | nursing | person</annotation> <!-- 1F468 200D 1F37C -->
+		<annotation cp="👨‍🍼">baby | feed | feeding | nanny | newborn | nursing | father | dad | man</annotation> <!-- 1F468 200D 1F37C -->
 		<annotation cp="👨‍🍼" type="tts">man feeding baby</annotation>
-		<annotation cp="🧑‍🍼">baby | dad | feed | feeding | man | mom | nanny | newborn | nursing | person | woman</annotation> <!-- 1F9D1 200D 1F37C -->
+		<annotation cp="🧑‍🍼">baby | feed | feeding | nanny | newborn | nursing | parent</annotation> <!-- 1F9D1 200D 1F37C -->
 		<annotation cp="🧑‍🍼" type="tts">person feeding baby</annotation>
 		<annotation cp="👼">angel | baby | church | face | fairy | fairytale | fantasy | tale</annotation>
 		<annotation cp="👼" type="tts">baby angel</annotation>
-		<annotation cp="🎅">celebration | Christmas | claus | fairy | fantasy | father | santa | tale</annotation>
+		<annotation cp="🎅">claus | santa | Christmas | celebration | fairy | fantasy | tale | father | holiday | merry | xmas</annotation>
 		<annotation cp="🎅" type="tts">Santa Claus</annotation>
-		<annotation cp="🤶">celebration | Christmas | claus | mother | Mrs. | santa</annotation>
+		<annotation cp="🤶">claus | santa | Christmas | celebration | fairy | fantasy | tale | mother | Mrs | holiday | merry | xmas</annotation>
 		<annotation cp="🤶" type="tts">Mrs. Claus</annotation>
-		<annotation cp="🧑‍🎄">christmas | claus | hat | holiday | merry | mx | person | santa | santy | xmas</annotation> <!-- 1F9D1 200D 1F384 -->
-		<annotation cp="🧑‍🎄" type="tts">mx claus</annotation>
-		<annotation cp="🦸">good | hero | heroine | superhero | superpower | superpowers</annotation>
+		<annotation cp="🧑‍🎄">claus | santa | Christmas | celebration | fairy | fantasy | tale | Mx | holiday | merry | xmas</annotation> <!-- 1F9D1 200D 1F384 -->
+		<annotation cp="🧑‍🎄" type="tts">Mx claus</annotation>
+		<annotation cp="🦸">good | hero | superhero | superpower</annotation>
 		<annotation cp="🦸" type="tts">superhero</annotation>
-		<annotation cp="🦸‍♂">good | hero | man | superhero | superpower</annotation>
+		<annotation cp="🦸‍♂">good | hero | superhero | superpower | man</annotation>
 		<annotation cp="🦸‍♂" type="tts">man superhero</annotation>
 		<annotation cp="🦸‍♀">good | hero | heroine | superhero | superpower | woman</annotation>
 		<annotation cp="🦸‍♀" type="tts">woman superhero</annotation>
-		<annotation cp="🦹">bad | criminal | evil | person | superpower | superpowers | supervillain | villain</annotation>
+		<annotation cp="🦹">criminal | evil | superpower | supervillain | villain | bad</annotation>
 		<annotation cp="🦹" type="tts">supervillain</annotation>
-		<annotation cp="🦹‍♂">criminal | evil | man | superpower | supervillain | villain</annotation>
+		<annotation cp="🦹‍♂">criminal | evil | superpower | supervillain | villain | bad | man</annotation>
 		<annotation cp="🦹‍♂" type="tts">man supervillain</annotation>
-		<annotation cp="🦹‍♀">criminal | evil | superpower | supervillain | villain | woman</annotation>
+		<annotation cp="🦹‍♀">criminal | evil | superpower | supervillain | villain | bad | woman</annotation>
 		<annotation cp="🦹‍♀" type="tts">woman supervillain</annotation>
-		<annotation cp="🧙">fantasy | mage | magic | person | play | role | sorcerer | sorceress | spell | summon | witch | wizard</annotation>
+		<annotation cp="🧙">mage | fantasy | magic | play | spell | summon | witch | wizard | sorcery | sorcerer | sorceress</annotation>
 		<annotation cp="🧙" type="tts">mage</annotation>
-		<annotation cp="🧙‍♂">mage | man | sorcerer | wizard</annotation>
+		<annotation cp="🧙‍♂">mage | fantasy | magic | play | spell | summon | witch | wizard | sorcery | sorcerer | sorceress | man</annotation>
 		<annotation cp="🧙‍♂" type="tts">man mage</annotation>
-		<annotation cp="🧙‍♀">mage | sorceress | witch | woman</annotation>
+		<annotation cp="🧙‍♀">mage | fantasy | magic | play | spell | summon | witch | wizard | sorcery | sorcerer | sorceress | woman</annotation>
 		<annotation cp="🧙‍♀" type="tts">woman mage</annotation>
-		<annotation cp="🧚">fairy | fairytale | fantasy | myth | Oberon | person | pixie | Puck | tale | Titania | wings</annotation>
+		<annotation cp="🧚">fairy | fairytale | fantasy | myth | person | pixie | tale | wings</annotation>
 		<annotation cp="🧚" type="tts">fairy</annotation>
-		<annotation cp="🧚‍♂">fairy | man | Oberon | Puck</annotation>
+		<annotation cp="🧚‍♂">fairy | fairytale | fantasy | myth | person | pixie | tale | wings | man | Oberon | Puck</annotation>
 		<annotation cp="🧚‍♂" type="tts">man fairy</annotation>
-		<annotation cp="🧚‍♀">fairy | Titania | woman</annotation>
+		<annotation cp="🧚‍♀">fairy | fairytale | fantasy | myth | person | pixie | tale | wings | Titania | woman</annotation>
 		<annotation cp="🧚‍♀" type="tts">woman fairy</annotation>
-		<annotation cp="🧛">blood | costume | Dracula | fangs | halloween | person | scary | supernatural | teeth | undead | vampire</annotation>
+		<annotation cp="🧛">undead | vampire | blood | fangs | halloween | scary | supernatural | teeth</annotation>
 		<annotation cp="🧛" type="tts">vampire</annotation>
-		<annotation cp="🧛‍♂">Dracula | man | undead | vampire</annotation>
+		<annotation cp="🧛‍♂">undead | vampire | blood | fangs | halloween | scary | supernatural | teeth | man</annotation>
 		<annotation cp="🧛‍♂" type="tts">man vampire</annotation>
-		<annotation cp="🧛‍♀">undead | vampire | woman</annotation>
+		<annotation cp="🧛‍♀">undead | vampire | blood | fangs | halloween | scary | supernatural | teeth | woman</annotation>
 		<annotation cp="🧛‍♀" type="tts">woman vampire</annotation>
-		<annotation cp="🧜">creatures | fairytale | folklore | mermaid | merman | merperson | merwoman | ocean | sea | siren | trident | under | the | sea</annotation>
+		<annotation cp="🧜">creature | fairytale | folklore | merperson | ocean | sea | siren | trident</annotation>
 		<annotation cp="🧜" type="tts">merperson</annotation>
-		<annotation cp="🧜‍♂">merman | Triton</annotation>
+		<annotation cp="🧜‍♂">creature | fairytale | folklore | merman | ocean | sea | siren | trident | Triton | Poseidon | Neptune</annotation>
 		<annotation cp="🧜‍♂" type="tts">merman</annotation>
-		<annotation cp="🧜‍♀">mermaid | merwoman</annotation>
+		<annotation cp="🧜‍♀">mermaid | merwoman | creature | fairytale | folklore | ocean | sea | siren | trident</annotation>
 		<annotation cp="🧜‍♀" type="tts">mermaid</annotation>
-		<annotation cp="🧝">elf | elves | enchantment | fantasy | folklore | magical | mystical | mythical | person</annotation>
+		<annotation cp="🧝">elf | magical | elves | magic | enchantment | fantasy | folklore | myth</annotation>
 		<annotation cp="🧝" type="tts">elf</annotation>
-		<annotation cp="🧝‍♂">elf | magical | man</annotation>
+		<annotation cp="🧝‍♂">elf | magical | elves | magic | enchantment | fantasy | folklore | myth | man</annotation>
 		<annotation cp="🧝‍♂" type="tts">man elf</annotation>
-		<annotation cp="🧝‍♀">elf | magical | woman</annotation>
+		<annotation cp="🧝‍♀">elf | magical | elves | magic | enchantment | fantasy | folklore | myth | woman</annotation>
 		<annotation cp="🧝‍♀" type="tts">woman elf</annotation>
-		<annotation cp="🧞">djinn | fantasy | genie | jinn | lamp | mystical | mythical | person | rub | wishes</annotation>
+		<annotation cp="🧞">djinn | genie | fantasy | jinn | lamp | myth | rub | wishes</annotation>
 		<annotation cp="🧞" type="tts">genie</annotation>
-		<annotation cp="🧞‍♂">djinn | genie | man</annotation>
+		<annotation cp="🧞‍♂">djinn | genie | fantasy | jinn | lamp | myth | rub | wishes | man</annotation>
 		<annotation cp="🧞‍♂" type="tts">man genie</annotation>
-		<annotation cp="🧞‍♀">djinn | genie | woman</annotation>
+		<annotation cp="🧞‍♀">djinn | genie | fantasy | jinn | lamp | myth | rub | wishes | woman</annotation>
 		<annotation cp="🧞‍♀" type="tts">woman genie</annotation>
-		<annotation cp="🧟">apocalypse | dead | halloween | horror | person | scary | undead | walking | zombie</annotation>
+		<annotation cp="🧟">dead | undead | walking | zombie | apocalypse | halloween | horror | scary</annotation>
 		<annotation cp="🧟" type="tts">zombie</annotation>
-		<annotation cp="🧟‍♂">dead | man | undead | walking | zombie</annotation>
+		<annotation cp="🧟‍♂">dead | undead | walking | zombie | apocalypse | halloween | horror | scary | man</annotation>
 		<annotation cp="🧟‍♂" type="tts">man zombie</annotation>
-		<annotation cp="🧟‍♀">dead | undead | walking | woman | zombie</annotation>
+		<annotation cp="🧟‍♀">dead | undead | walking | zombie | apocalypse | halloween | horror | scary | woman</annotation>
 		<annotation cp="🧟‍♀" type="tts">woman zombie</annotation>
 		<annotation cp="🧌">fairy | fantasy | monster | tale | troll | trolling</annotation> <!-- 1F9CC -->
 		<annotation cp="🧌" type="tts">troll</annotation>
-		<annotation cp="💆">face | getting | headache | massage | person | relax | relaxing | salon | soothe | spa | tension | therapy | treatment | woman</annotation>
+		<annotation cp="💆">face | getting | massage | headache | relax | relaxing | salon | soothe | spa | tension | therapy | treatment | person</annotation>
 		<annotation cp="💆" type="tts">person getting massage</annotation>
-		<annotation cp="💆‍♂">face | getting | headache | man | massage | relax | relaxing | salon | soothe | tension</annotation>
+		<annotation cp="💆‍♂">face | getting | massage | headache | relax | relaxing | salon | soothe | spa | tension | therapy | treatment | man</annotation>
 		<annotation cp="💆‍♂" type="tts">man getting massage</annotation>
-		<annotation cp="💆‍♀">face | getting | massage | woman</annotation>
+		<annotation cp="💆‍♀">face | getting | massage | headache | relax | relaxing | salon | soothe | spa | tension | therapy | treatment | woman</annotation>
 		<annotation cp="💆‍♀" type="tts">woman getting massage</annotation>
-		<annotation cp="💇">barber | beauty | chop | cosmetology | cut | getting | groom | hair | haircut | parlor | person | shears | style | woman</annotation>
+		<annotation cp="💇">haircut | barber | beauty | chop | cosmetology | cut | groom | hair | parlor | shears | style | person</annotation>
 		<annotation cp="💇" type="tts">person getting haircut</annotation>
-		<annotation cp="💇‍♂">barber | beauty | getting | hair | haircut | man | parlor</annotation>
+		<annotation cp="💇‍♂">haircut | barber | beauty | chop | cosmetology | cut | groom | hair | parlor | shears | style | person | man</annotation>
 		<annotation cp="💇‍♂" type="tts">man getting haircut</annotation>
-		<annotation cp="💇‍♀">getting | haircut | woman</annotation>
+		<annotation cp="💇‍♀">haircut | barber | beauty | chop | cosmetology | cut | groom | hair | parlor | shears | style | person | woman</annotation>
 		<annotation cp="💇‍♀" type="tts">woman getting haircut</annotation>
-		<annotation cp="🚶">amble | gait | hike | man | pace | pedestrian | person | saunter | stride | stroll | swagger | walk | walking</annotation>
+		<annotation cp="🚶">hike | walk | walking | amble | gait | man | pace | pedestrian | stride | stroll | person</annotation>
 		<annotation cp="🚶" type="tts">person walking</annotation>
-		<annotation cp="🚶‍♂">hike | man | walk | walking</annotation>
+		<annotation cp="🚶‍♂">hike | walk | walking | amble | gait | man | pace | pedestrian | stride | stroll | man</annotation>
 		<annotation cp="🚶‍♂" type="tts">man walking</annotation>
-		<annotation cp="🚶‍♀">amble | hike | pedestrian | saunter | stride | stroll | swagger | walk | walking | woman</annotation>
+		<annotation cp="🚶‍♀">hike | walk | walking | amble | gait | man | pace | pedestrian | stride | stroll | woman</annotation>
 		<annotation cp="🚶‍♀" type="tts">woman walking</annotation>
 		<annotation cp="🧍">person | stand | standing</annotation>
 		<annotation cp="🧍" type="tts">person standing</annotation>
-		<annotation cp="🧍‍♂">man | standing</annotation>
+		<annotation cp="🧍‍♂">man | stand | standing</annotation>
 		<annotation cp="🧍‍♂" type="tts">man standing</annotation>
-		<annotation cp="🧍‍♀">standing | woman</annotation>
+		<annotation cp="🧍‍♀">stand | standing | woman</annotation>
 		<annotation cp="🧍‍♀" type="tts">woman standing</annotation>
-		<annotation cp="🧎">kneel | kneeling | knees | person | your</annotation>
+		<annotation cp="🧎">kneel | kneeling | knees | person</annotation>
 		<annotation cp="🧎" type="tts">person kneeling</annotation>
-		<annotation cp="🧎‍♂">kneeling | man</annotation>
+		<annotation cp="🧎‍♂">kneel | kneeling | knees | man</annotation>
 		<annotation cp="🧎‍♂" type="tts">man kneeling</annotation>
-		<annotation cp="🧎‍♀">kneeling | woman</annotation>
+		<annotation cp="🧎‍♀">kneel | kneeling | knees | woman</annotation>
 		<annotation cp="🧎‍♀" type="tts">woman kneeling</annotation>
-		<annotation cp="🧑‍🦯">accessibility | blind | cane | person | white</annotation>
+		<annotation cp="🧑‍🦯">accessibility | blind | cane | person | white | probing</annotation>
 		<annotation cp="🧑‍🦯" type="tts">person with white cane</annotation>
 		<annotation cp="👨‍🦯">accessibility | blind | cane | man | probing | white</annotation>
 		<annotation cp="👨‍🦯" type="tts">man with white cane</annotation>
@@ -1564,11 +1563,11 @@ annotations.
 		<annotation cp="👨‍🦽" type="tts">man in manual wheelchair</annotation>
 		<annotation cp="👩‍🦽">accessibility | manual | wheelchair | woman</annotation>
 		<annotation cp="👩‍🦽" type="tts">woman in manual wheelchair</annotation>
-		<annotation cp="🏃">coming | fast | hurry | man | marathon | move | person | quick | race | runner | running | rush | speed</annotation>
+		<annotation cp="🏃">marathon | fast | hurry | move | person | quick | race | racing | run | rush | speed | quick | person</annotation>
 		<annotation cp="🏃" type="tts">person running</annotation>
-		<annotation cp="🏃‍♂">man | marathon | racing | running</annotation>
+		<annotation cp="🏃‍♂">marathon | fast | hurry | man | move | quick | race | racing | run | rush | speed | quick | man</annotation>
 		<annotation cp="🏃‍♂" type="tts">man running</annotation>
-		<annotation cp="🏃‍♀">coming | fast | hurry | marathon | quick | racing | runner | running | rush | speed | woman</annotation>
+		<annotation cp="🏃‍♀">marathon | fast | hurry | move | quick | race | racing | run | rush | speed | quick | woman</annotation>
 		<annotation cp="🏃‍♀" type="tts">woman running</annotation>
 		<annotation cp="💃">dance | dancer | dancing | elegant | festive | flair | flamenco | groove | let’s | salsa | tango | woman</annotation>
 		<annotation cp="💃" type="tts">woman dancing</annotation>
@@ -1576,23 +1575,23 @@ annotations.
 		<annotation cp="🕺" type="tts">man dancing</annotation>
 		<annotation cp="🕴">business | levitating | person | suit</annotation>
 		<annotation cp="🕴" type="tts">person in suit levitating</annotation>
-		<annotation cp="👯">bestie | bff | bunny | counterpart | dancer | double | ear | ears | identical | pair | party | partying | people | soulmate | twin | twinsies</annotation>
+		<annotation cp="👯">bunny | dancer | ear | partying | bestie | bff | counterpart | double | identical | pair | party | people | soulmate | twin | twinsies | people</annotation>
 		<annotation cp="👯" type="tts">people with bunny ears</annotation>
-		<annotation cp="👯‍♂">bff | bunny | dancer | ear | ears | men | party | partying | twinsies</annotation>
+		<annotation cp="👯‍♂">bunny | dancer | ear | partying | bestie | bff | counterpart | double | identical | pair | party | people | soulmate | twin | twinsies | men</annotation>
 		<annotation cp="👯‍♂" type="tts">men with bunny ears</annotation>
-		<annotation cp="👯‍♀">bunny | dancer | ear | ears | partying | women</annotation>
+		<annotation cp="👯‍♀">bunny | dancer | ear | partying | bestie | bff | counterpart | double | identical | pair | party | people | soulmate | twin | twinsies | women</annotation>
 		<annotation cp="👯‍♀" type="tts">women with bunny ears</annotation>
-		<annotation cp="🧖">day | hamam | luxurious | pamper | person | relax | room | sauna | spa | steam | steambath | steamy | unwind</annotation>
+		<annotation cp="🧖">room | sauna | steam | day  | luxurious | pamper | person | relax | spa | steambath | unwind</annotation>
 		<annotation cp="🧖" type="tts">person in steamy room</annotation>
-		<annotation cp="🧖‍♂">man | in | sauna | room | sauna | steam | steamy</annotation>
+		<annotation cp="🧖‍♂">room | sauna | steam | day  | luxurious | pamper | man | relax | spa | steambath | unwind</annotation>
 		<annotation cp="🧖‍♂" type="tts">man in steamy room</annotation>
-		<annotation cp="🧖‍♀">room | sauna | steam | steamy | woman | in | sauna</annotation>
+		<annotation cp="🧖‍♀">room | sauna | steam | day  | luxurious | pamper | woman | relax | spa | steambath | unwind</annotation>
 		<annotation cp="🧖‍♀" type="tts">woman in steamy room</annotation>
-		<annotation cp="🧗">climb | climber | climbing | mountain | person | rock | scale | up</annotation>
+		<annotation cp="🧗">climber | climbing | climb | mountain | rock | scale | up | person</annotation>
 		<annotation cp="🧗" type="tts">person climbing</annotation>
-		<annotation cp="🧗‍♂">climber | climbing | man</annotation>
+		<annotation cp="🧗‍♂">climber | climbing | climb | mountain | rock | scale | up | man</annotation>
 		<annotation cp="🧗‍♂" type="tts">man climbing</annotation>
-		<annotation cp="🧗‍♀">climber | climbing | woman</annotation>
+		<annotation cp="🧗‍♀">climber | climbing | climb | mountain | rock | scale | up | woman</annotation>
 		<annotation cp="🧗‍♀" type="tts">woman climbing</annotation>
 		<annotation cp="🤺">fencer | fencing | person | sword</annotation>
 		<annotation cp="🤺" type="tts">person fencing</annotation>
@@ -1602,53 +1601,53 @@ annotations.
 		<annotation cp="⛷" type="tts">skier</annotation>
 		<annotation cp="🏂">ski | snow | snowboard | snowboarder | sport</annotation>
 		<annotation cp="🏂" type="tts">snowboarder</annotation>
-		<annotation cp="🏌">ball | birdie | caddy | driving | golf | golfing | green | person | pga | putt | range | tee</annotation>
+		<annotation cp="🏌">golf | golfing | ball | birdie | caddy | driving | green | person | pga | putt | range | tee</annotation>
 		<annotation cp="🏌" type="tts">person golfing</annotation>
-		<annotation cp="🏌‍♂">golf | golfing | man</annotation>
+		<annotation cp="🏌‍♂">golf | golfing | ball | birdie | caddy | driving | green | man | pga | putt | range | tee</annotation>
 		<annotation cp="🏌‍♂" type="tts">man golfing</annotation>
-		<annotation cp="🏌‍♀">ball | driving | golf | golfing | range | woman</annotation>
+		<annotation cp="🏌‍♀">golf | golfing | ball | birdie | caddy | driving | green | woman | pga | putt | range | tee</annotation>
 		<annotation cp="🏌‍♀" type="tts">woman golfing</annotation>
-		<annotation cp="🏄">beach | ocean | person | sport | surf | surfer | surfing | swell | waves</annotation>
+		<annotation cp="🏄">surfing | beach | ocean | sport | surf | surfer | swell | waves | person</annotation>
 		<annotation cp="🏄" type="tts">person surfing</annotation>
-		<annotation cp="🏄‍♂">man | surfing</annotation>
+		<annotation cp="🏄‍♂">surfing | beach | ocean | sport | surf | surfer | swell | waves | man</annotation>
 		<annotation cp="🏄‍♂" type="tts">man surfing</annotation>
-		<annotation cp="🏄‍♀">beach | ocean | person | sport | surfer | surfing | waves | woman</annotation>
+		<annotation cp="🏄‍♀">surfing | beach | ocean | sport | surf | surfer | swell | waves | person</annotation>
 		<annotation cp="🏄‍♀" type="tts">woman surfing</annotation>
-		<annotation cp="🚣">boat | canoe | cruise | fishing | lake | oar | paddle | person | raft | river | row | rowboat | rowing</annotation>
+		<annotation cp="🚣">boat | rowboat | rowing | canoe | cruise | fishing | lake | oar | paddle | person | raft | river | row</annotation>
 		<annotation cp="🚣" type="tts">person rowing boat</annotation>
-		<annotation cp="🚣‍♂">boat | man | rowboat | rowing</annotation>
+		<annotation cp="🚣‍♂">boat | rowboat | rowing | canoe | cruise | fishing | lake | oar | paddle | man | raft | river | row</annotation>
 		<annotation cp="🚣‍♂" type="tts">man rowing boat</annotation>
-		<annotation cp="🚣‍♀">boat | cruise | fishing | lake | river | row | rowboat | rowing | woman</annotation>
+		<annotation cp="🚣‍♀">boat | rowboat | rowing | canoe | cruise | fishing | lake | oar | paddle | raft | river | row | woman</annotation>
 		<annotation cp="🚣‍♀" type="tts">woman rowing boat</annotation>
-		<annotation cp="🏊">freestyle | person | sport | swim | swimmer | swimming | triathlon</annotation>
+		<annotation cp="🏊">swim | swimming | freestyle | person | sport | swimmer | triathlon</annotation>
 		<annotation cp="🏊" type="tts">person swimming</annotation>
-		<annotation cp="🏊‍♂">man | swim | swimming</annotation>
+		<annotation cp="🏊‍♂">swim | swimming | freestyle | man | sport | swimmer | triathlon</annotation>
 		<annotation cp="🏊‍♂" type="tts">man swimming</annotation>
-		<annotation cp="🏊‍♀">sport | swim | swimmer | swimming | woman</annotation>
+		<annotation cp="🏊‍♀">swim | swimming | freestyle | man | sport | swimmer | triathlon</annotation>
 		<annotation cp="🏊‍♀" type="tts">woman swimming</annotation>
-		<annotation cp="⛹">athletic | ball | basketball | bouncing | championship | dribble | free | man | net | nothing | but | net | person | player | throw</annotation>
+		<annotation cp="⛹">ball | bouncing | athletic | basketball | championship | dribble | net | person | player | throw</annotation>
 		<annotation cp="⛹" type="tts">person bouncing ball</annotation>
-		<annotation cp="⛹‍♂">ball | bouncing | man</annotation>
+		<annotation cp="⛹‍♂">ball | bouncing | athletic | basketball | championship | dribble | net | man | player | throw</annotation>
 		<annotation cp="⛹‍♂" type="tts">man bouncing ball</annotation>
-		<annotation cp="⛹‍♀">ball | basketball | bouncing | player | woman</annotation>
+		<annotation cp="⛹‍♀">ball | bouncing | athletic | basketball | championship | dribble | net | player | throw | woman</annotation>
 		<annotation cp="⛹‍♀" type="tts">woman bouncing ball</annotation>
-		<annotation cp="🏋">barbell | bodybuilder | deadlift | lifter | lifting | person | powerlifting | weight | weightlifter | weights | workout</annotation>
+		<annotation cp="🏋">lifter | lifting | weight | weights | barbell | bodybuilder | deadlift | person | powerlifting | weightlifter | workout</annotation>
 		<annotation cp="🏋" type="tts">person lifting weights</annotation>
-		<annotation cp="🏋‍♂">lifter | lifting | man | weight | weights</annotation>
+		<annotation cp="🏋‍♂">lifter | lifting | weight | weights | barbell | bodybuilder | deadlift | man | powerlifting | weightlifter | workout</annotation>
 		<annotation cp="🏋‍♂" type="tts">man lifting weights</annotation>
-		<annotation cp="🏋‍♀">lifter | lifting | weight | weightlifter | weights | woman | workout</annotation>
+		<annotation cp="🏋‍♀">lifter | lifting | weight | weights | barbell | bodybuilder | deadlift | woman | powerlifting | weightlifter | workout</annotation>
 		<annotation cp="🏋‍♀" type="tts">woman lifting weights</annotation>
-		<annotation cp="🚴">bicycle | bicyclist | bike | biking | cycle | cyclist | person | riding | sport</annotation>
+		<annotation cp="🚴">bicycle | biking | cyclist | bicyclist | bike | cycle | person | riding | sport</annotation>
 		<annotation cp="🚴" type="tts">person biking</annotation>
-		<annotation cp="🚴‍♂">bicycle | biking | cyclist | man</annotation>
+		<annotation cp="🚴‍♂">bicycle | biking | cyclist | bicyclist | bike | cycle | man | riding | sport</annotation>
 		<annotation cp="🚴‍♂" type="tts">man biking</annotation>
-		<annotation cp="🚴‍♀">bicycle | bicyclist | bike | biking | cyclist | riding | sport | woman</annotation>
+		<annotation cp="🚴‍♀">bicycle | biking | cyclist | bicyclist | bike | cycle | riding | sport | woman</annotation>
 		<annotation cp="🚴‍♀" type="tts">woman biking</annotation>
-		<annotation cp="🚵">athletic | bicycle | bicyclist | bike | biking | cyclist | mountain | person | riding | sport</annotation>
+		<annotation cp="🚵">bicycle | biking | cyclist | bicyclist | bike | cycle | person | riding | sport | mountain</annotation>
 		<annotation cp="🚵" type="tts">person mountain biking</annotation>
-		<annotation cp="🚵‍♂">bicycle | bike | biking | cyclist | man | mountain</annotation>
+		<annotation cp="🚵‍♂">bicycle | biking | cyclist | bicyclist | bike | cycle | man | riding | sport | mountain</annotation>
 		<annotation cp="🚵‍♂" type="tts">man mountain biking</annotation>
-		<annotation cp="🚵‍♀">bicycle | bicyclist | bike | biking | cyclist | mountain | riding | sport | woman</annotation>
+		<annotation cp="🚵‍♀">bicycle | biking | cyclist | bicyclist | bike | cycle | riding | sport | mountain | woman</annotation>
 		<annotation cp="🚵‍♀" type="tts">woman mountain biking</annotation>
 		<annotation cp="🤸">active | cartwheel | cartwheeling | excited | flip | gymnastics | happy | person | somersault</annotation>
 		<annotation cp="🤸" type="tts">person cartwheeling</annotation>
@@ -1656,11 +1655,11 @@ annotations.
 		<annotation cp="🤸‍♂" type="tts">man cartwheeling</annotation>
 		<annotation cp="🤸‍♀">active | cartwheel | cartwheeling | excited | flip | gymnastics | happy | somersault | woman</annotation>
 		<annotation cp="🤸‍♀" type="tts">woman cartwheeling</annotation>
-		<annotation cp="🤼">combat | duel | people | ring | tournament | wrestle | wrestler | wrestling</annotation>
+		<annotation cp="🤼">combat | duel | ring | tournament | wrestle | wrestling | grapple | people</annotation>
 		<annotation cp="🤼" type="tts">people wrestling</annotation>
-		<annotation cp="🤼‍♂">combat | duel | men | ring | tournament | wrestle | wrestling</annotation>
+		<annotation cp="🤼‍♂">combat | duel | ring | tournament | wrestle | wrestling | grapple | men</annotation>
 		<annotation cp="🤼‍♂" type="tts">men wrestling</annotation>
-		<annotation cp="🤼‍♀">combat | duel | grapple | ring | tournament | women | wrestle | wrestling</annotation>
+		<annotation cp="🤼‍♀">combat | duel | ring | tournament | wrestle | wrestling | grapple | women</annotation>
 		<annotation cp="🤼‍♀" type="tts">women wrestling</annotation>
 		<annotation cp="🤽">person | playing | polo | sport | swimming | water | waterpolo</annotation>
 		<annotation cp="🤽" type="tts">person playing water polo</annotation>
@@ -1668,35 +1667,35 @@ annotations.
 		<annotation cp="🤽‍♂" type="tts">man playing water polo</annotation>
 		<annotation cp="🤽‍♀">playing | polo | sport | swimming | water | waterpolo | woman</annotation>
 		<annotation cp="🤽‍♀" type="tts">woman playing water polo</annotation>
-		<annotation cp="🤾">athletics | ball | catch | chuck | handball | hurl | lob | person | pitch | playing | sport | throw | toss</annotation>
+		<annotation cp="🤾">handball | playing | athletics | ball | catch | chuck | hurl | lob | pitch | sport | throw | toss | person</annotation>
 		<annotation cp="🤾" type="tts">person playing handball</annotation>
-		<annotation cp="🤾‍♂">handball | man | playing</annotation>
+		<annotation cp="🤾‍♂">handball | playing | athletics | ball | catch | chuck | hurl | lob | pitch | sport | throw | toss | man</annotation>
 		<annotation cp="🤾‍♂" type="tts">man playing handball</annotation>
-		<annotation cp="🤾‍♀">athletics | ball | catch | chuck | handball | hurl | lob | pitch | playing | sport | throw | toss | woman</annotation>
+		<annotation cp="🤾‍♀">handball | playing | athletics | ball | catch | chuck | hurl | lob | pitch | sport | throw | toss | woman</annotation>
 		<annotation cp="🤾‍♀" type="tts">woman playing handball</annotation>
-		<annotation cp="🤹">act | balance | balancing | handle | juggle | juggling | manage | multitask | person | skill</annotation>
+		<annotation cp="🤹">juggle | juggling | multitask | act | balance | balancing | handle | manage | skill | person</annotation>
 		<annotation cp="🤹" type="tts">person juggling</annotation>
-		<annotation cp="🤹‍♂">act | balancing | handle | juggle | juggling | man | manage | multitask</annotation>
+		<annotation cp="🤹‍♂">juggle | juggling | multitask | act | balance | balancing | handle | manage | skill | man</annotation>
 		<annotation cp="🤹‍♂" type="tts">man juggling</annotation>
-		<annotation cp="🤹‍♀">juggle | juggling | multitask | woman</annotation>
+		<annotation cp="🤹‍♀">juggle | juggling | multitask | act | balance | balancing | handle | manage | skill | woman</annotation>
 		<annotation cp="🤹‍♀" type="tts">woman juggling</annotation>
-		<annotation cp="🧘">cross | crossed | legged | legs | lotus | meditation | peace | person | position | relax | serenity | yoga | yogi | zen</annotation>
+		<annotation cp="🧘">lotus | meditation | position | yoga | cross | legged | legs | peace | relax | serenity | yogi | zen | person</annotation>
 		<annotation cp="🧘" type="tts">person in lotus position</annotation>
-		<annotation cp="🧘‍♂">lotus | man | in | lotus | position | meditation | position | yoga</annotation>
+		<annotation cp="🧘‍♂">lotus | meditation | position | yoga | cross | legged | legs | peace | relax | serenity | yogi | zen | man</annotation>
 		<annotation cp="🧘‍♂" type="tts">man in lotus position</annotation>
-		<annotation cp="🧘‍♀">lotus | meditation | position | woman | in | lotus | position | yoga</annotation>
+		<annotation cp="🧘‍♀">lotus | meditation | position | yoga | cross | legged | legs | peace | relax | serenity | yogi | zen | woman</annotation>
 		<annotation cp="🧘‍♀" type="tts">woman in lotus position</annotation>
 		<annotation cp="🛀">bath | bathtub | person | taking | tub</annotation>
 		<annotation cp="🛀" type="tts">person taking bath</annotation>
 		<annotation cp="🛌">bed | bedtime | good | goodnight | hotel | nap | night | person | sleep | tired | zzz</annotation>
 		<annotation cp="🛌" type="tts">person in bed</annotation>
-		<annotation cp="🧑‍🤝‍🧑">couple | hand | hands | hold | holding | people | person</annotation>
+		<annotation cp="🧑‍🤝‍🧑">bae | bff | bestie | dating | flirt | friends | hand | hold | twins | people | couple</annotation>
 		<annotation cp="🧑‍🤝‍🧑" type="tts">people holding hands</annotation>
-		<annotation cp="👭">bae | best | friends | bestie | bff | bond | couple | friend | friendship | girls | hold | sis | sisters | women | twins | love | dating</annotation>
+		<annotation cp="👭">bae | friends | hand | bestie | flirt | bff | couple | girls | hold | sisters | women | twins | dating</annotation>
 		<annotation cp="👭" type="tts">women holding hands</annotation>
-		<annotation cp="👫">bae | couple | dating | flirt | friend | friends | hand | hands | hold | holding | love | man | woman</annotation>
+		<annotation cp="👫">bae | bff | bestie | dating | flirt | friends | hand | hold | twins | man | woman | couple</annotation>
 		<annotation cp="👫" type="tts">woman and man holding hands</annotation>
-		<annotation cp="👬">bae | bond | boys | brothers | bff | couple | dating | friend | friendship | hand | hold | love | men | twins</annotation>
+		<annotation cp="👬">bae | bff | bestie | dating | flirt | friends | hand | hold | twins | men | boys | brothers | couple</annotation>
 		<annotation cp="👬" type="tts">men holding hands</annotation>
 		<annotation cp="💏">anniversary | babe | bae | couple | date | dating | heart | kiss | love | mwah | person | romance | together | xoxo</annotation>
 		<annotation cp="💏" type="tts">kiss</annotation>
@@ -3723,11 +3722,11 @@ annotations.
 		<annotation cp="🔣" type="tts">input symbols</annotation>
 		<annotation cp="🔤">abc | alphabet | input | latin | letters</annotation>
 		<annotation cp="🔤" type="tts">input latin letters</annotation>
-		<annotation cp="🅰">(blood | blood | button | type | type)</annotation>
+		<annotation cp="🅰">blood | button | type | type</annotation>
 		<annotation cp="🅰" type="tts">A button (blood type)</annotation>
-		<annotation cp="🆎">(blood | AB | blood | button | type | type)</annotation>
+		<annotation cp="🆎">AB | blood | button | type | type</annotation>
 		<annotation cp="🆎" type="tts">AB button (blood type)</annotation>
-		<annotation cp="🅱">(blood | B | blood | button | type | type)</annotation>
+		<annotation cp="🅱">B | blood | button | type | type</annotation>
 		<annotation cp="🅱" type="tts">B button (blood type)</annotation>
 		<annotation cp="🆑">button | CL</annotation>
 		<annotation cp="🆑" type="tts">CL button</annotation>
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CheckEmojiAnnotations.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CheckEmojiAnnotations.java
new file mode 100644
index 00000000000..6dad887169a
--- /dev/null
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/CheckEmojiAnnotations.java
@@ -0,0 +1,149 @@
+package org.unicode.cldr.tool;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.Sets;
+import com.ibm.icu.impl.UnicodeMap;
+import com.ibm.icu.text.UnicodeSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import org.unicode.cldr.util.Annotations;
+import org.unicode.cldr.util.CLDRConfig;
+import org.unicode.cldr.util.CLDRFile;
+import org.unicode.cldr.util.CldrUtility;
+import org.unicode.cldr.util.CodePointEscaper;
+import org.unicode.cldr.util.Emoji;
+import org.unicode.cldr.util.SimpleUnicodeSetFormatter;
+import org.unicode.cldr.util.XPathParts;
+
+public class CheckEmojiAnnotations {
+    private static final Joiner JOIN_BAR = Joiner.on(" | ");
+
+    public static void main(String[] args) {
+        UnicodeSet rgi = Emoji.getAllRgi();
+        UnicodeSet rgiNoVariant = Emoji.getAllRgiNoES();
+        CLDRFile root = CLDRConfig.getInstance().getAnnotationsFactory().make("en", false);
+        UnicodeSet rootEmoji = new UnicodeSet();
+        for (String path : root) {
+            XPathParts parts = XPathParts.getFrozenInstance(path);
+            String cp = parts.getAttributeValue(-1, "cp");
+            if (cp != null && rgiNoVariant.contains(cp)) {
+                rootEmoji.add(cp);
+            }
+        }
+        rootEmoji.freeze();
+
+        UnicodeMap<Annotations> english = Annotations.getData("en");
+        Map<String, UnicodeSet> keywordToEmoji = new TreeMap<>();
+        UnicodeSet allUnclean = new UnicodeSet();
+
+        for (Annotations entry : english.values()) {
+            Set<String> keywords = entry.getKeywords();
+            UnicodeSet emoji = english.getSet(entry);
+            emoji.retainAll(rootEmoji);
+            UnicodeSet emojiRestored = new UnicodeSet();
+            for (String emojiItem : emoji) {
+                emojiRestored.add(Emoji.restoreVariants(emojiItem));
+            }
+            UnicodeSet unclean = new UnicodeSet(emojiRestored).removeAll(rgi);
+            allUnclean.add(unclean);
+
+            emojiRestored = emojiRestored.retainAll(rgi);
+            if (emojiRestored.isEmpty()) {
+                continue;
+            }
+
+            for (String keyword : keywords) {
+                UnicodeSet value = keywordToEmoji.get(keyword);
+                if (value == null) {
+                    keywordToEmoji.put(keyword, value = new UnicodeSet());
+                }
+                value.addAll(emojiRestored);
+            }
+        }
+        CldrUtility.protectCollection(keywordToEmoji);
+
+        int count = 0;
+        System.out.println("### Emoji to Keywords");
+        TreeSet<String> sortedRootEmoji = new TreeSet<>(Emoji.COLLATOR);
+        rootEmoji.addAllTo(sortedRootEmoji);
+        for (String emoji : sortedRootEmoji) {
+            String restored = Emoji.restoreVariants(emoji);
+            Set<String> keywords = english.get(emoji).getKeywords();
+            System.out.println(
+                    ++count + "\t" + restored + "\t" + emoji + "\t" + JOIN_BAR.join(keywords));
+        }
+
+        UnicodeSet toEscape =
+                new UnicodeSet(CodePointEscaper.FORCE_ESCAPE)
+                        .remove(CodePointEscaper.ZWJ.getCodePoint())
+                        .remove(CodePointEscaper.RANGE.getCodePoint())
+                        .freeze();
+        SimpleUnicodeSetFormatter suf = new SimpleUnicodeSetFormatter(null, toEscape);
+
+        allUnclean = allUnclean.retainAll(rgiNoVariant);
+        if (!allUnclean.isEmpty()) {
+            throw new IllegalArgumentException("Missing " + suf.format(allUnclean));
+        }
+
+        System.out.println("### Keywords to Emoji");
+
+        count = 0;
+        for (Entry<String, UnicodeSet> entry : keywordToEmoji.entrySet()) {
+            System.out.println(
+                    ++count + "\t" + entry.getKey() + "\t" + suf.format(entry.getValue()));
+        }
+
+        System.out.println("### Gender Variants");
+
+        for (Set<String> entry : Emoji.getGenderGroups()) {
+            // find common keywords
+            Set<String> common = null;
+            Set<String> cleanEntry = new TreeSet<>();
+            for (String s : entry) {
+                if (!rootEmoji.contains(Emoji.removeVariants(s))) {
+                    continue;
+                }
+                Annotations anno = getAnnotations(english, s);
+                if (anno == null) {
+                    continue;
+                }
+                cleanEntry.add(s);
+                if (common == null) {
+                    System.out.println();
+                    common = new TreeSet<>();
+                    common.addAll(anno.getKeywords());
+                } else {
+                    common.retainAll(anno.getKeywords());
+                }
+            }
+            // now show them
+            if (cleanEntry.size() > 1) {
+                for (String s : cleanEntry) {
+                    Annotations anno = getAnnotations(english, s);
+                    String removed = Emoji.removeVariants(s);
+                    System.out.println(
+                            s
+                                    + "\t"
+                                    + removed
+                                    + "\t"
+                                    + anno.getShortName()
+                                    + "\t"
+                                    + JOIN_BAR.join(common)
+                                    + "\t"
+                                    + JOIN_BAR.join(Sets.difference(anno.getKeywords(), common)));
+                }
+            }
+        }
+    }
+
+    public static Annotations getAnnotations(UnicodeMap<Annotations> english, String s) {
+        Annotations anno = english.get(s);
+        if (anno == null) {
+            anno = english.get(s.replace(Emoji.EMOJI_VARIANT, ""));
+        }
+        return anno;
+    }
+}
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/Emoji.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/Emoji.java
index 2abf032a9f9..e855317ad4c 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/Emoji.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/Emoji.java
@@ -3,12 +3,20 @@
 import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
+import com.google.common.collect.Ordering;
+import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.impl.UnicodeMap;
 import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.CharSequences;
+import com.ibm.icu.text.Collator;
+import com.ibm.icu.text.Transliterator;
+import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.ICUException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -17,13 +25,23 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.unicode.cldr.draft.FileUtilities;
 import org.unicode.cldr.util.PathHeader.PageId;
 
 public class Emoji {
+    public static final Collator COLLATOR = CLDRConfig.getInstance().getCollator();
     public static final String EMOJI_VARIANT = "\uFE0F";
+    public static final char JOINER = '\u200D';
+    public static final String JOINER_STR = "\u200D";
+
+    public static final String FEMALE = "\u2640";
+    public static final String MALE = "\u2642";
+    public static final String TRANSGENDER = "\u26A7";
+
     public static final String COMBINING_ENCLOSING_KEYCAP = "\u20E3";
     public static final String ZWJ = "\u200D";
     public static final UnicodeSet REGIONAL_INDICATORS = new UnicodeSet(0x1F1E6, 0x1F1FF).freeze();
@@ -39,6 +57,7 @@ public class Emoji {
                                     + "{❤‍🔥}, {❤‍🩹}, {😮‍💨}, {😵‍💫}" // #E13.1
                                     + "]")
                     .freeze();
+    public static final UnicodeSet SKIN_MODIIFERS = new UnicodeSet("[🏻-🏿]").freeze();
     // May have to add from above, if there is a failure in testAnnotationPaths. Failure will be
     // like:
     // got java.util.TreeSet<[//ldml/annotations/annotation[@cp="🏳‍⚧"][@type="tts"],
@@ -53,6 +72,57 @@ public class Emoji {
     static final UnicodeMap<String> emojiToMinorCategory = new UnicodeMap<>();
     static final UnicodeMap<String> toName = new UnicodeMap<>();
 
+    static final UnicodeSet NEUTRAL =
+            new UnicodeSet(
+                            "[⛷⛹🏂-🏄🏇🏊-🏎👤👥👪-👳👶👷👼💁💂💆💇💏💑🕴🕵🗣🙅-🙇🙋🙍🙎🚣🚴-🚶🛀🛌🤦🤰🤱🤵🤷-🤾🦸🦹🧑-🧟]")
+                    .freeze();
+    public static final String ZWJ_HANDSHAKE_ZWJ = JOINER_STR + UTF16.valueOf(0x1F91D) + JOINER_STR;
+    public static final String ZWJ_HEART_ZWJ = JOINER_STR + UTF16.valueOf(0x2764) + JOINER_STR;
+    public static final UnicodeSet FULL_ZWJ_GENDER_MARKERS =
+            new UnicodeSet()
+                    .add(JOINER + FEMALE)
+                    .add(JOINER + MALE)
+                    .add(JOINER + FEMALE + EMOJI_VARIANT)
+                    .add(JOINER + MALE + EMOJI_VARIANT)
+                    .freeze();
+
+    static final Transliterator NEUTER;
+
+    static {
+        final UnicodeMap<String> TO_NEUTRAL =
+                new UnicodeMap<String>()
+                        .put("👦", "🧒")
+                        .put("👧", "🧒")
+                        .put("👨", "🧑")
+                        .put("👩", "🧑")
+                        .put("👴", "🧓")
+                        .put("👵", "🧓")
+                        .put("🤴", "🧑\u200D👑")
+                        .put("👸", "🧑\u200D👑")
+                        .put("🎅", "🧑\u200D🎄")
+                        .put("🤶", "🧑\u200D🎄")
+                        .put("💃", "🧑\u200D🎶")
+                        .put("🕺", "🧑\u200D🎶")
+                        .put("👫", "🧑" + ZWJ_HANDSHAKE_ZWJ + "🧑")
+                        .put("👬", "🧑" + ZWJ_HANDSHAKE_ZWJ + "🧑")
+                        .put("👭", "🧑" + ZWJ_HANDSHAKE_ZWJ + "🧑")
+                        .put(JOINER + FEMALE + EMOJI_VARIANT, "")
+                        .put(JOINER + MALE + EMOJI_VARIANT, "")
+                        .put(JOINER + FEMALE, "")
+                        .put(JOINER + MALE, "")
+                        .freeze();
+        Map<String, String> results =
+                new TreeMap(Ordering.from(SupplementalDataInfo.LENGTH_FIRST).reversed());
+        for (Entry<String, String> entry : TO_NEUTRAL.entrySet()) {
+            results.put(entry.getKey(), entry.getValue());
+        }
+        StringBuilder sb = new StringBuilder();
+        for (Entry<String, String> entry : results.entrySet()) {
+            sb.append(entry.getKey()).append('→').append(entry.getValue()).append(";\n");
+        }
+        NEUTER = Transliterator.createFromRules("foo", sb.toString(), Transliterator.FORWARD);
+    }
+
     static {
         emojiToMajorCategory.setErrorOnReset(true);
         emojiToMinorCategory.setErrorOnReset(true);
@@ -74,8 +144,9 @@ public class Emoji {
     static final UnicodeSet allRgi = new UnicodeSet();
     static final UnicodeSet allRgiNoES = new UnicodeSet();
 
+    static final UnicodeMap<String> restoreVariants = new UnicodeMap<>();
+    static final Set<Set<String>> genderSets;
     // ߘ€ E1.0 grinning face
-
     static {
         /*
          * Example from emoji-test.txt:
@@ -89,6 +160,7 @@ public class Emoji {
         final Matcher commentMatcher =
                 Pattern.compile("\\s*[\\S]+\\s+(?:E\\d*.\\d+\\s+)(.*)").matcher("");
 
+        Map<String, String> neutralAndGenderedToNeutral = new TreeMap<>();
         for (String line : FileUtilities.in(Emoji.class, "data/emoji/emoji-test.txt")) {
             if (line.startsWith("#")) {
                 line = line.substring(1).trim();
@@ -117,8 +189,22 @@ public class Emoji {
             }
             String type = typeRaw.substring(0, hashPos).trim();
             if (type.startsWith("fully-qualified")) {
+                if (original.contains("♂")) {
+                    int debug = 0;
+                }
                 allRgi.add(original);
-                allRgiNoES.add(original.replace(Emoji.EMOJI_VARIANT, ""));
+                final String variantsRemoved = removeVariants(original);
+                allRgiNoES.add(variantsRemoved);
+                if (!original.equals(variantsRemoved)) {
+                    restoreVariants.put(variantsRemoved, original);
+                }
+                if (!SKIN_MODIIFERS.containsSome(original)) {
+                    String neutral = NEUTER.transform(original);
+                    if (!neutral.equals(original)) {
+                        neutralAndGenderedToNeutral.put(original, neutral);
+                        neutralAndGenderedToNeutral.put(neutral, neutral);
+                    }
+                }
             }
             emojiToMajorCategory.put(original, majorCategory);
             emojiToMinorCategory.put(original, minorCategory);
@@ -175,6 +261,40 @@ public class Emoji {
         toName.freeze();
         allRgi.freeze();
         allRgiNoES.freeze();
+        // hack
+        for (String s :
+                new UnicodeSet(
+                        "[#*0-9©®‼⁉™ℹ↔-↙↩↪⌨⏏⏭-⏯ ⏱⏲⏸-⏺Ⓜ▪▫▶◀◻◼☀-☄☎☑☘☝☠☢ ☣☦☪☮☯☸-☺♀♂♟♠♣♥♦♨♻♾⚒⚔-⚗ ⚙⚛⚜⚠⚧⚰⚱⛈⛏⛑⛓⛩⛰⛱⛴⛷-⛹✂"
+                                + "✈✉ ✌✍✏✒✔✖✝✡✳✴❄❇❣❤➡⤴⤵⬅-⬇〰 〽㊗㊙🅰🅱🅾🅿🈂🈷🌡🌤-🌬🌶🍽🎖🎗🎙-🎛🎞 🎟🏋-🏎🏔-🏟🏳🏵🏷🐿👁📽🕉"
+                                + "🕊🕯🕰🕳-🕹🖇 🖊-🖍🖐🖥🖨🖱🖲🖼🗂-🗄🗑-🗓🗜-🗞🗡🗣🗨 🗯🗳🗺🛋🛍-🛏🛠-🛥🛩🛰🛳]")) {
+            restoreVariants.put(s, s + Emoji.EMOJI_VARIANT);
+        }
+        restoreVariants.freeze();
+        Multimap<String, String> neutralToOthers = TreeMultimap.create(COLLATOR, COLLATOR);
+        Multimaps.invertFrom(Multimaps.forMap(neutralAndGenderedToNeutral), neutralToOthers);
+        Set<Set<String>> toGenderGroup = new LinkedHashSet<>();
+        for (Collection<String> set : neutralToOthers.asMap().values()) {
+            TreeSet<String> s = new TreeSet<>(COLLATOR);
+            s.addAll(set);
+            toGenderGroup.add(ImmutableSet.copyOf(s));
+        }
+        genderSets = CldrUtility.protectCollection(toGenderGroup);
+    }
+
+    public static String removeVariants(String original) {
+        return original.replace(Emoji.EMOJI_VARIANT, "");
+    }
+
+    public static Set<Set<String>> getGenderGroups() {
+        return genderSets;
+    }
+
+    public static final String restoreVariants(String source) {
+        String restored = restoreVariants.get(source);
+        if (restored != null) {
+            int debug = 0;
+        }
+        return restored == null ? source : restored;
     }
 
     private static <K, V> void putUnique(Map<K, V> map, K key, V value) {
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/SimpleUnicodeSetFormatter.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/SimpleUnicodeSetFormatter.java
index cb3a38caf46..e2e5967187d 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/SimpleUnicodeSetFormatter.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/SimpleUnicodeSetFormatter.java
@@ -64,18 +64,17 @@ public class SimpleUnicodeSetFormatter implements FormatterParser<UnicodeSet> {
     public SimpleUnicodeSetFormatter(
             Comparator<String> col, UnicodeSet forceHex, int maxDisallowRanges) {
         // collate, but preserve non-equivalents
-        this.comparator = ComparatorUtilities.wrapForCodePoints(col);
+        this.comparator = col == null ? COLLATOR : ComparatorUtilities.wrapForCodePoints(col);
         this.forceHex = forceHex == null ? CodePointEscaper.FORCE_ESCAPE : forceHex.freeze();
         this.maxDisallowRanges = maxDisallowRanges;
     }
 
     static final int DEFAULT_MAX = 1024;
+    public static final Comparator<String> COLLATOR =
+            (Comparator) CLDRConfig.getInstance().getCollator();
 
     public static SimpleUnicodeSetFormatter fromIcuLocale(String localeId) {
-        return new SimpleUnicodeSetFormatter(
-                (Comparator) ComparatorUtilities.getIcuCollator(localeId, Collator.IDENTICAL),
-                null,
-                DEFAULT_MAX);
+        return new SimpleUnicodeSetFormatter(COLLATOR, null, DEFAULT_MAX);
     }
 
     public SimpleUnicodeSetFormatter(Comparator<String> col, UnicodeSet forceHex) {