diff --git a/forge-gui/res/cardsfolder/a/awakening_zone.txt b/forge-gui/res/cardsfolder/a/awakening_zone.txt
index ac0d91ba718..2d5765d8039 100644
--- a/forge-gui/res/cardsfolder/a/awakening_zone.txt
+++ b/forge-gui/res/cardsfolder/a/awakening_zone.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You
+DeckHas:Ability$Token
 DeckHints:Type$Eldrazi
-DeckHas:Ability$Mana.Colorless|Token
 Oracle:At the beginning of your upkeep, you may create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/a/axgard_artisan.txt b/forge-gui/res/cardsfolder/a/axgard_artisan.txt
index 53182c074ab..9b49f8f76e4 100644
--- a/forge-gui/res/cardsfolder/a/axgard_artisan.txt
+++ b/forge-gui/res/cardsfolder/a/axgard_artisan.txt
@@ -4,6 +4,6 @@ Types:Creature Dwarf Artificer
 PT:2/1
 T:Mode$ CounterAddedOnce | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | FirstTime$ True | Execute$ TrigToken | TriggerDescription$ Whenever one or more +1/+1 counters are put on CARDNAME for the first time each turn, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+DeckHas:Ability$Token
 DeckHints:Ability$Counters
-DeckHas:Ability$Token|Sacrifice & Type$Artifact|Treasure
 Oracle:Whenever one or more +1/+1 counters are put on Axgard Artisan for the first time each turn, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/a/aya_of_alexandria.txt b/forge-gui/res/cardsfolder/a/aya_of_alexandria.txt
index f8174941cf2..9c2932a3db0 100644
--- a/forge-gui/res/cardsfolder/a/aya_of_alexandria.txt
+++ b/forge-gui/res/cardsfolder/a/aya_of_alexandria.txt
@@ -6,5 +6,5 @@ K:Menace
 K:Lifelink
 T:Mode$ DamageDone | ValidSource$ Creature.Historic+YouCtrl | Execute$ TrigToken | CombatDamage$ True | ValidTarget$ Player | TriggerZones$ Battlefield | TriggerDescription$ Whenever a historic creature you control deals combat damage to a player, create a 1/1 black Assassin creature token with menace. (Artifacts, legendaries, and Sagas are historic.)
 SVar:TrigToken:DB$ Token | TokenScript$ b_1_1_assassin_menace
-DeckHas:Ability$Token
+DeckHas:Ability$LifeGain|Token
 Oracle:Menace, lifelink\nWhenever a historic creature you control deals combat damage to a player, create a 1/1 black Assassin creature token with menace. (Artifacts, legendaries, and Sagas are historic.)
diff --git a/forge-gui/res/cardsfolder/a/ayara_widow_of_the_realm_ayara_furnace_queen.txt b/forge-gui/res/cardsfolder/a/ayara_widow_of_the_realm_ayara_furnace_queen.txt
index 1b01f24cdf4..8b21aeb9241 100644
--- a/forge-gui/res/cardsfolder/a/ayara_widow_of_the_realm_ayara_furnace_queen.txt
+++ b/forge-gui/res/cardsfolder/a/ayara_widow_of_the_realm_ayara_furnace_queen.txt
@@ -6,7 +6,8 @@ A:AB$ DealDamage | Cost$ T Sac<1/Creature.Other;Artifact.Other/another creature
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X
 SVar:X:Sacrificed$CardManaCost
 A:AB$ SetState | Cost$ 5 RP | Defined$ Self | Mode$ Transform | SorcerySpeed$ True | AILogic$ Always | SpellDescription$ Transform NICKNAME. Activate only as a sorcery.
-DeckHas:Ability$Sacrifice|LifeGain
+DeckHas:Ability$Sacrifice|LifeGain|Graveyard
+DeckHints:Type$Artifact
 AlternateMode:DoubleFaced
 Oracle:{T}, Sacrifice another creature or artifact: Ayara, Widow of the Realm deals X damage to target opponent or battle and you gain X life, where X is the sacrificed permanent's mana value.\n{5}{R/P}: Transform Ayara. Activate only as a sorcery. ({R/P} can be paid with {R} or 2 life.)
 
@@ -20,5 +21,4 @@ PT:4/4
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of combat on your turn, return up to one target artifact or creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
 SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Artifact.YouOwn,Creature.YouOwn | TgtPrompt$ Select up to one target artifact or creature from your graveyard | TargetMin$ 0 | TargetMax$ 1 | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Keywords$ Haste | Defined$ Targeted | Duration$ Permanent | AtEOT$ Exile
-DeckHas:Ability$Sacrifice|Graveyard
 Oracle:At the beginning of combat on your turn, return up to one target artifact or creature card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/a/azlask_the_swelling_scourge.txt b/forge-gui/res/cardsfolder/a/azlask_the_swelling_scourge.txt
index 177655b8b8c..10bd009a4a3 100644
--- a/forge-gui/res/cardsfolder/a/azlask_the_swelling_scourge.txt
+++ b/forge-gui/res/cardsfolder/a/azlask_the_swelling_scourge.txt
@@ -7,6 +7,7 @@ SVar:TrigExperience:DB$ PutCounter | Defined$ You | CounterType$ Experience | Co
 A:AB$ PumpAll | Cost$ W U B R G | ValidCards$ Creature.YouCtrl | NumAtt$ X | NumDef$ X | SubAbility$ DBPumpAll | SpellDescription$ Creatures you control get +X/+X until end of turn, where X is the number of experience counters you have.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Scion.YouCtrl,Spawn.YouCtrl | KW$ Annihilator:1 & Indestructible | SpellDescription$ Scions and Spawns you control gain indestructible and annihilator 1 until end of turn.
 SVar:X:Count$YourCountersExperience
+DeckHas:Ability$Counters
+DeckHints:Ability$Counters|Proliferate & Type$Eldrazi
 DeckNeeds:Type$Scion|Spawn
-DeckHints:Type$Eldrazi
 Oracle:Whenever Azlask, the Swelling Scourge or another colorless creature you control dies, you get an experience counter.\n{W}{U}{B}{R}{G}: Creatures you control get +X/+X until end of turn, where X is the number of experience counters you have. Scions and Spawns you control gain indestructible and annihilator 1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/azors_elocutors.txt b/forge-gui/res/cardsfolder/a/azors_elocutors.txt
index 852b6471dee..f8be4ece802 100644
--- a/forge-gui/res/cardsfolder/a/azors_elocutors.txt
+++ b/forge-gui/res/cardsfolder/a/azors_elocutors.txt
@@ -9,4 +9,6 @@ SVar:TalkedEnough:Count$CardCounters.FILIBUSTER
 T:Mode$ DamageDone | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ RemoveCounter | TriggerDescription$ Whenever a source deals damage to you, remove a filibuster counter from CARDNAME.
 SVar:RemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ FILIBUSTER | CounterNum$ 1
 SVar:AIEvaluationModifier:30
+DeckHas:Ability$Counters
+DeckHints:Ability$Counters|Proliferate
 Oracle:At the beginning of your upkeep, put a filibuster counter on Azor's Elocutors. Then if Azor's Elocutors has five or more filibuster counters on it, you win the game.\nWhenever a source deals damage to you, remove a filibuster counter from Azor's Elocutors.