diff --git a/src/aer-data/src/ENG/legacyOfGravehold/cards.ts b/src/aer-data/src/ENG/legacyOfGravehold/cards.ts
index 1000eaad..fcad613d 100644
--- a/src/aer-data/src/ENG/legacyOfGravehold/cards.ts
+++ b/src/aer-data/src/ENG/legacyOfGravehold/cards.ts
@@ -135,7 +135,7 @@ const gems: ICard[] = [
         Each ally gains an <span class="aether">&AElig;</span> token.
       </p>
     `,
-    keywords: [],
+    keywords: ['aether token'],
   },
   {
     type: 'Gem',
@@ -256,7 +256,7 @@ const relics: ICard[] = [
         <b>Recall:</b> Gravehold gains 1 life.
       </p>
     `,
-    keywords: ['recall', 'silence'],
+    keywords: ['aether token', 'recall', 'silence'],
   },
   {
     type: 'Relic',
@@ -320,7 +320,7 @@ const spells: ICard[] = [
         Each ally gains an <span class="aether">&AElig;</span> token.
       </p>
     `,
-    keywords: [],
+    keywords: ['aether token'],
   },
   {
     type: 'Spell',
diff --git a/src/aer-data/src/ENG/pastAndFuture/cards.ts b/src/aer-data/src/ENG/pastAndFuture/cards.ts
index 55e2c31e..bc9adcfd 100644
--- a/src/aer-data/src/ENG/pastAndFuture/cards.ts
+++ b/src/aer-data/src/ENG/pastAndFuture/cards.ts
@@ -186,7 +186,7 @@ export const cards: ICard[] = [
       Any player may destroy a card in hand or in their discard pile. <br/>
       </p>
       `,
-    keywords: ['develop'],
+    keywords: ['aether token', 'develop'],
   },
   {
     type: 'Spell',
diff --git a/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts b/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts
index 58adee0b..2a6ee08b 100644
--- a/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts
+++ b/src/aer-data/src/ENG/talesOfOldGravehold/mages.ts
@@ -26,7 +26,7 @@ export const mages: Mage[] = [
 		card in hand. If they do,
 		that player gains an <span class="aether">&AElig;</span> token.
 		</p>`,
-        keywords: [],
+        keywords: ['aether token'],
       },
     ],
     complexityRating: 2,
diff --git a/src/aer-data/src/ENG/theAbyss/cards.ts b/src/aer-data/src/ENG/theAbyss/cards.ts
index 2e07bbcd..e2df675a 100644
--- a/src/aer-data/src/ENG/theAbyss/cards.ts
+++ b/src/aer-data/src/ENG/theAbyss/cards.ts
@@ -45,7 +45,7 @@ export const cards: ICard[] = [
 	  any ally gains 2 <span class="aether">&AElig;</span> tokens.
       </p>
       `,
-    keywords: [],
+    keywords: ['aether token'],
   },
   {
     type: 'Relic',
diff --git a/src/aer-data/src/ENG/theCaverns/cards.ts b/src/aer-data/src/ENG/theCaverns/cards.ts
index fbbc1404..1718334c 100644
--- a/src/aer-data/src/ENG/theCaverns/cards.ts
+++ b/src/aer-data/src/ENG/theCaverns/cards.ts
@@ -79,7 +79,7 @@ export const cards: ICard[] = [
 	  <b>Cast:</b> Deal 3 damage. Gain all of the <span class="aether">&AElig;</span> tokens on this.
       </p>
       `,
-    keywords: [],
+    keywords: ['aether token'],
   },
   {
     type: 'Spell',
diff --git a/src/aer-data/src/ENG/theDescent/cards.ts b/src/aer-data/src/ENG/theDescent/cards.ts
index 52ab21a8..022ea053 100644
--- a/src/aer-data/src/ENG/theDescent/cards.ts
+++ b/src/aer-data/src/ENG/theDescent/cards.ts
@@ -91,7 +91,7 @@ export const cards: ICard[] = [
       Any ally draws a card and gains an <span class="aether">&AElig;</span> token.
       </p>
       `,
-    keywords: ['elemental token'],
+    keywords: ['aether token', 'elemental token'],
   },
   {
     type: 'Relic',
@@ -122,7 +122,7 @@ export const cards: ICard[] = [
       If you have 3 or more charges, that ally gains an additional <span class="aether">&AElig;</span> token.
       </p>
       `,
-    keywords: [],
+    keywords: ['aether token'],
   },
   {
     type: 'Relic',
diff --git a/src/aer-data/src/ENG/theDescent/mages.ts b/src/aer-data/src/ENG/theDescent/mages.ts
index 20d934fc..78ce2173 100644
--- a/src/aer-data/src/ENG/theDescent/mages.ts
+++ b/src/aer-data/src/ENG/theDescent/mages.ts
@@ -21,7 +21,7 @@ export const mages: Mage[] = [
         cost: 0,
         effect: `<p>Gain 1 <span class="aether">&AElig;</span>.<br/>
             You may suffer 1 damage. If you do, any ally gains an <span class="aether">&AElig;</span> token.`,
-        keywords: [],
+        keywords: ['aether token'],
       },
       {
         type: 'Spell',
@@ -32,7 +32,7 @@ export const mages: Mage[] = [
         effect: `<p>While prepped, when you suffer damage, gain an <span class="aether">&AElig;</span> token.<br/>
             When a player would suffer damage, you may suffer that damage instead.<br/>
             <b>Cast:</b> deal 1 damage.`,
-        keywords: [],
+        keywords: ['aether token'],
       },
     ],
     complexityRating: 2,
@@ -182,7 +182,7 @@ export const mages: Mage[] = [
             If you do, gain 2 <span class="aether">&AElig;</span> tokens.
             <hr>
             Gain 1 <span class="aether">&AElig;</span>.</p>`,
-        keywords: [],
+        keywords: ['aether token'],
       },
     ],
     complexityRating: 3,
diff --git a/src/aer-data/src/ENG/theRuins/cards.ts b/src/aer-data/src/ENG/theRuins/cards.ts
index 6bbad9ea..bfa5b2aa 100644
--- a/src/aer-data/src/ENG/theRuins/cards.ts
+++ b/src/aer-data/src/ENG/theRuins/cards.ts
@@ -13,7 +13,7 @@ export const cards: ICard[] = [
         You may discard this during an ally's main phase. If you do that player may <b>Conjure</b>.
       </p>
     `,
-    keywords: ['conjure'],
+    keywords: ['aether token', 'conjure'],
   },
   {
     type: 'Gem',
@@ -59,7 +59,7 @@ export const cards: ICard[] = [
 	<b>Recall:</b> Discard a card in hand. If you do, any player gains an <span class="aether">&AElig;</span> token.
       </p>
     `,
-    keywords: ['recall'],
+    keywords: ['aether token', 'recall'],
   },
   {
     type: 'Gem',
@@ -148,7 +148,7 @@ export const cards: ICard[] = [
 	Reveal the top card of the turn order deck. If it is a player card, that player gains an <span class="aether">&AElig;</span> token.
       </p>
     `,
-    keywords: [],
+    keywords: ['aether token'],
   },
   {
     type: 'Spell',
@@ -282,7 +282,7 @@ export const cards: ICard[] = [
 	Any ally gains an <span class="aether">&AElig;</span> token for each spell prepped in an adjacent breach.
       </p>
     `,
-    keywords: [],
+    keywords: ['aether token'],
   },
   {
     type: 'Spell',