diff --git a/forge-gui/res/cardsfolder/a/arclight_phoenix.txt b/forge-gui/res/cardsfolder/a/arclight_phoenix.txt
index f5ea5df6ed9..026a1c61c69 100644
--- a/forge-gui/res/cardsfolder/a/arclight_phoenix.txt
+++ b/forge-gui/res/cardsfolder/a/arclight_phoenix.txt
@@ -7,4 +7,5 @@ K:Haste
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Graveyard | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigReturn | OptionalDecider$ You | TriggerDescription$ At the beginning of combat on your turn, if you've cast three or more instant and sorcery spells this turn, you may return CARDNAME from your graveyard to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield
 SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
+DeckNeeds:Type$Instant|Sorcery
 Oracle:Flying, Haste\nAt the beginning of combat on your turn, if you've cast three or more instant and sorcery spells this turn, you may return Arclight Phoenix from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/a/assure_assemble.txt b/forge-gui/res/cardsfolder/a/assure_assemble.txt
index eb67e2204a3..092e54f9cc1 100644
--- a/forge-gui/res/cardsfolder/a/assure_assemble.txt
+++ b/forge-gui/res/cardsfolder/a/assure_assemble.txt
@@ -4,6 +4,7 @@ Types:Instant
 AlternateMode:Split
 A:SP$ PutCounter | Cost$ G/W G/W | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on target creature. It gains indestructible until end of turn.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Indestructible
+DeckHas:Ability$Counters & Ability$Token
 Oracle:Put a +1/+1 counter on target creature. It gains indestructible until end of turn.
 
 ALTERNATE
@@ -12,5 +13,5 @@ Name:Assemble
 ManaCost:4 G W
 Types:Instant
 A:SP$ Token | Cost$ 4 G W | TokenAmount$ 3 | TokenScript$ wg_2_2_elf_knight_vigilance | SpellDescription$ Create three 2/2 green and white Elf Knight creature tokens with vigilance.
-DeckHas:Ability$Token
+DeckHas:Ability$Counters & Ability$Token
 Oracle:Create three 2/2 green and white Elf Knight creature tokens with vigilance.
diff --git a/forge-gui/res/cardsfolder/a/attendant_of_vraska.txt b/forge-gui/res/cardsfolder/a/attendant_of_vraska.txt
index d31ef72a28f..f02fdcd7d51 100644
--- a/forge-gui/res/cardsfolder/a/attendant_of_vraska.txt
+++ b/forge-gui/res/cardsfolder/a/attendant_of_vraska.txt
@@ -5,4 +5,5 @@ PT:3/3
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | IsPresent$ Planeswalker.Vraska+YouCtrl | Execute$ TrigGainLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if you control a Vraska planeswalker, you gain life equal to CARDNAME's power.
 SVar:TrigGainLife:DB$GainLife | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:TriggeredCard$CardPower
+DeckNeeds:Type$Vraska
 Oracle:When Attendant of Vraska dies, if you control a Vraska planeswalker, you gain life equal to Attendant of Vraska's power.
diff --git a/forge-gui/res/cardsfolder/a/aurelia_exemplar_of_justice.txt b/forge-gui/res/cardsfolder/a/aurelia_exemplar_of_justice.txt
index 5920bd231d3..b2a20a416f1 100644
--- a/forge-gui/res/cardsfolder/a/aurelia_exemplar_of_justice.txt
+++ b/forge-gui/res/cardsfolder/a/aurelia_exemplar_of_justice.txt
@@ -9,4 +9,5 @@ SVar:DBPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | NumAtt$ 2 | RememberTargets
 SVar:DBPump1:DB$Pump | Defined$ Remembered | KW$ Trample | ConditionDefined$ Remembered | ConditionPresent$ Card.Red | SubAbility$ DBPump2
 SVar:DBPump2:DB$Pump | Defined$ Remembered | KW$ Vigilance | ConditionDefined$ Remembered | ConditionPresent$ Card.White | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+DeckHas:Ability$Counters
 Oracle:Flying\nMentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\nAt the beginning of combat on your turn, choose up to one target creature you control. Until end of turn, that creature gets +2/+0, gains trample if it's red, and gains vigilance if it's white.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/b/barging_sergeant.txt b/forge-gui/res/cardsfolder/b/barging_sergeant.txt
index e0e24d93c6f..595eb1697f0 100644
--- a/forge-gui/res/cardsfolder/b/barging_sergeant.txt
+++ b/forge-gui/res/cardsfolder/b/barging_sergeant.txt
@@ -4,4 +4,5 @@ Types:Creature Minotaur Soldier
 PT:4/2
 K:Haste
 K:Mentor
+DeckHas:Ability$Counters
 Oracle:Haste\nMentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)
diff --git a/forge-gui/res/cardsfolder/b/barrier_of_bones.txt b/forge-gui/res/cardsfolder/b/barrier_of_bones.txt
index 4c092100c9f..ae3c126b121 100644
--- a/forge-gui/res/cardsfolder/b/barrier_of_bones.txt
+++ b/forge-gui/res/cardsfolder/b/barrier_of_bones.txt
@@ -5,4 +5,5 @@ PT:0/3
 K:Defender
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Defender\nWhen Barrier of Bones enters the battlefield, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/b/beacon_bolt.txt b/forge-gui/res/cardsfolder/b/beacon_bolt.txt
index 76ebddf053b..52b23157897 100644
--- a/forge-gui/res/cardsfolder/b/beacon_bolt.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_bolt.txt
@@ -5,4 +5,5 @@ K:Jump-start
 A:SP$ DealDamage | Cost$ 1 U R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | References$ X,Y | SpellDescription$ CARDNAME deals damage to target creature equal to the total number of instant and sorcery cards you own in exile and in your graveyard.
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn/Plus.Y
 SVar:Y:Count$ValidExile Instant.YouOwn,Sorcery.YouOwn
+DeckHints:Type$Instant|Sorcery
 Oracle:Beacon Bolt deals damage to target creature equal to the total number of instant and sorcery cards you own in exile and in your graveyard.\nJump-start (You may cast this card from your graveyard by discarding a card in addition to paying its other costs. Then exile this card.)
diff --git a/forge-gui/res/cardsfolder/b/beamsplitter_mage.txt b/forge-gui/res/cardsfolder/b/beamsplitter_mage.txt
index 66f2bc8fe77..a83584e2a6c 100644
--- a/forge-gui/res/cardsfolder/b/beamsplitter_mage.txt
+++ b/forge-gui/res/cardsfolder/b/beamsplitter_mage.txt
@@ -4,4 +4,5 @@ Types:Creature Vedalken Wizard
 PT:2/2
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | IsSingleTarget$ True | TargetsValid$ Card.Self | CanTargetOtherCondition$ Creature.YouCtrl | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an instant or sorcery that targets only CARDNAME, if you control one or more other creatures that spell could target, choose one of those creatures. Copy that spell. The copy targets the chosen creature.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ You | CopyForEachCanTarget$ Creature.YouCtrl | ChooseOnlyOne$ True
+DeckHints:Ability$Instant|Sorcery
 Oracle:Whenever you cast an instant or sorcery spell that targets only Beamsplitter Mage, if you control one or more other creatures that spell could target, choose one of those creatures. Copy that spell. The copy targets the chosen creature.
diff --git a/forge-gui/res/cardsfolder/b/blade_instructor.txt b/forge-gui/res/cardsfolder/b/blade_instructor.txt
index a8969b6e857..dc0478e63b6 100644
--- a/forge-gui/res/cardsfolder/b/blade_instructor.txt
+++ b/forge-gui/res/cardsfolder/b/blade_instructor.txt
@@ -3,4 +3,5 @@ ManaCost:2 W
 Types:Creature Human Soldier
 PT:3/1
 K:Mentor
+DeckHas:Ability$Counters
 Oracle:Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)
diff --git a/forge-gui/res/cardsfolder/b/boros_challenger.txt b/forge-gui/res/cardsfolder/b/boros_challenger.txt
index 5e2da20eaf6..4106f4ddc17 100644
--- a/forge-gui/res/cardsfolder/b/boros_challenger.txt
+++ b/forge-gui/res/cardsfolder/b/boros_challenger.txt
@@ -4,4 +4,5 @@ Types:Creature Human Soldier
 PT:2/3
 K:Mentor
 A:AB$ Pump | Cost$ 2 R W | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+DeckHas:Ability$Counters
 Oracle:Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\n{2}{R}{W}: Boros Challenger gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/chamber_sentry.txt b/forge-gui/res/cardsfolder/c/chamber_sentry.txt
index 3816568e85d..cbaa7f301cb 100644
--- a/forge-gui/res/cardsfolder/c/chamber_sentry.txt
+++ b/forge-gui/res/cardsfolder/c/chamber_sentry.txt
@@ -8,4 +8,5 @@ A:AB$ DealDamage | Announce$ X | Cost$ X T SubCounter<X/P1P1> | ValidTgts$ Creat
 SVar:X:Count$xPaid
 A:AB$ ChangeZone | Cost$ W U B R G | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
 SVar:DiscardMe:1
+DeckHas:Ability$Counters
 Oracle:Chamber Sentry enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.\n{X}, {T}, Remove X +1/+1 counters from Chamber Sentry: It deals X damage to any target.\n{W}{U}{B}{R}{G}: Return Chamber Sentry from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/charnel_troll.txt b/forge-gui/res/cardsfolder/c/charnel_troll.txt
index 6ce2cf5f619..ab2e2318e6d 100644
--- a/forge-gui/res/cardsfolder/c/charnel_troll.txt
+++ b/forge-gui/res/cardsfolder/c/charnel_troll.txt
@@ -10,4 +10,6 @@ SVar:DBSac:DB$ Sacrifice | SacValid# Self | ConditionDefined$ Remembered | Condi
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ PutCounter | Cost$ B G Discard<1/Creature> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
 SVar:RemRandomDeck:True
+DeckNeeds:Ability$Graveyard
+DeckHas:Ability$Counters
 Oracle:Trample\nAt the beginning of your upkeep, exile a creature card from your graveyard. If you do, put a +1/+1 counter on Charnel Troll. Otherwise sacrifice it.\n{B}{G}, Discard a creature card: Put a +1/+1 counter on Charnel Troll.
diff --git a/forge-gui/res/cardsfolder/c/citywatch_sphinx.txt b/forge-gui/res/cardsfolder/c/citywatch_sphinx.txt
index 1e759f40719..9f332935c10 100644
--- a/forge-gui/res/cardsfolder/c/citywatch_sphinx.txt
+++ b/forge-gui/res/cardsfolder/c/citywatch_sphinx.txt
@@ -5,4 +5,5 @@ PT:5/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME dies, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
 SVar:TrigSurveil:DB$Surveil | Defined$ You | Amount$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Flying\nWhen Citywatch Sphinx dies, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/c/connive_concoct.txt b/forge-gui/res/cardsfolder/c/connive_concoct.txt
index 3bc243c7625..1e45b353c28 100644
--- a/forge-gui/res/cardsfolder/c/connive_concoct.txt
+++ b/forge-gui/res/cardsfolder/c/connive_concoct.txt
@@ -12,4 +12,5 @@ ManaCost:3 U B
 Types:Sorcery
 A:SP$ Surveil | Cost$ 3 U B | Amount$ 3 | SubAbility$ DBReturn | SpellDescription$ Surveil 3, then return a creature card from your graveyard to the battlefield.
 SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouCtrl | ChangeNum$ 1 | Hidden$ True
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Surveil 3, then return a creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/c/crackling_drake.txt b/forge-gui/res/cardsfolder/c/crackling_drake.txt
index a5a51fb25ad..9cdd75848e4 100644
--- a/forge-gui/res/cardsfolder/c/crackling_drake.txt
+++ b/forge-gui/res/cardsfolder/c/crackling_drake.txt
@@ -9,4 +9,5 @@ SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 SVar:GraveCount:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 SVar:ExileCount:Count$ValidExile Instant.YouOwn,Sorcery.YouOwn
 SVar:X:SVar$GraveCount/Plus.ExileCount
+DeckNeeds:Type$Instant|Sorcery
 Oracle:Flying\nCrackling Drake's power is equal to the total number of instant and sorcery cards you own in exile and in your graveyard.\nWhen Crackling Drake enters the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/d/darkblade_agent.txt b/forge-gui/res/cardsfolder/d/darkblade_agent.txt
index a3ce8c4a4ae..d3a1b48e76e 100644
--- a/forge-gui/res/cardsfolder/d/darkblade_agent.txt
+++ b/forge-gui/res/cardsfolder/d/darkblade_agent.txt
@@ -6,4 +6,5 @@ S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Deathtouch | AddTrigger$
 SVar:Trig1:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever this creature deals combat damage to a player, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 SVar:X:Count$YouSurveilThisTurn
+DeckHints:Ability$Surveil
 Oracle:As long as you've surveilled this turn, Darkblade Agent has deathtouch and "Whenever this creature deals combat damage to a player, draw a card."
diff --git a/forge-gui/res/cardsfolder/d/dazzling_lights.txt b/forge-gui/res/cardsfolder/d/dazzling_lights.txt
index 76b9fdb89d6..8745c904b1a 100644
--- a/forge-gui/res/cardsfolder/d/dazzling_lights.txt
+++ b/forge-gui/res/cardsfolder/d/dazzling_lights.txt
@@ -3,4 +3,5 @@ ManaCost:U
 Types:Instant
 A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | IsCurse$ True | Subability$ DBSurveil | SpellDescription$ Target creature gets -3/-0 until end of turn. Surveil 2.
 SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Target creature gets -3/-0 until end of turn.\nSurveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/d/deadly_visit.txt b/forge-gui/res/cardsfolder/d/deadly_visit.txt
index 26792d9be3a..d211ef31cfb 100644
--- a/forge-gui/res/cardsfolder/d/deadly_visit.txt
+++ b/forge-gui/res/cardsfolder/d/deadly_visit.txt
@@ -3,4 +3,5 @@ ManaCost:3 B B
 Types:Sorcery
 A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Subability$ DBSurveil | SpellDescription$ Destroy target creature. Surveil 2 (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 SVar:DBSurveil:DB$ Surveil | Amount$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Destroy target creature.\nSurveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/d/dimir_informant.txt b/forge-gui/res/cardsfolder/d/dimir_informant.txt
index 5cb18e6f8a1..cd9104c4b42 100644
--- a/forge-gui/res/cardsfolder/d/dimir_informant.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_informant.txt
@@ -4,4 +4,5 @@ Types:Creature Human Rogue
 PT:1/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, then surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
 SVar:TrigSurveil:DB$Surveil | Defined$ You | Amount$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:When Dimir Informant enters the battlefield, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/d/dimir_spybug.txt b/forge-gui/res/cardsfolder/d/dimir_spybug.txt
index a0ab2b0ff30..4880d824087 100644
--- a/forge-gui/res/cardsfolder/d/dimir_spybug.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_spybug.txt
@@ -6,4 +6,6 @@ K:Flying
 K:Menace
 T:Mode$ Surveil | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you surveil, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHints:Ability$Surveil
+DeckHas:Ability$Counters
 Oracle:Flying\nMenace (This creature can't be blocked except by two or more creatures.)\nWhenever you surveil, put a +1/+1 counter on Dimir Spybug.
diff --git a/forge-gui/res/cardsfolder/d/discovery_dispersal.txt b/forge-gui/res/cardsfolder/d/discovery_dispersal.txt
index 43176fc47dd..bcf7d315b13 100644
--- a/forge-gui/res/cardsfolder/d/discovery_dispersal.txt
+++ b/forge-gui/res/cardsfolder/d/discovery_dispersal.txt
@@ -4,6 +4,7 @@ Types:Sorcery
 AlternateMode:Split
 A:SP$ Surveil | Cost$ 1 U/B | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2, then draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Surveil 2, then draw a card. (To surveil 2, look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 
 ALTERNATE
diff --git a/forge-gui/res/cardsfolder/d/disinformation_campaign.txt b/forge-gui/res/cardsfolder/d/disinformation_campaign.txt
index 17be691d384..4f4cc7c1072 100644
--- a/forge-gui/res/cardsfolder/d/disinformation_campaign.txt
+++ b/forge-gui/res/cardsfolder/d/disinformation_campaign.txt
@@ -6,4 +6,5 @@ SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ Player.Opponent | NumCards$ 1 | Mode$ TgtChoose
 T:Mode$ Surveil | ValidPlayer$ You | Execute$ TrigBounce | TriggerZones$ Battlefield | TriggerDescription$ Whenever you surveil, return CARDNAME to its owner's hand.
 SVar:TrigBounce:DB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ Self
+DeckHints:Ability$Surveil
 Oracle:When Disinformation Campaign enters the battlefield, you draw a card and each opponent discards a card.\nWhenever you surveil, return Disinformation Campaign to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/d/doom_whisperer.txt b/forge-gui/res/cardsfolder/d/doom_whisperer.txt
index ea6bdf4f39a..469af683112 100644
--- a/forge-gui/res/cardsfolder/d/doom_whisperer.txt
+++ b/forge-gui/res/cardsfolder/d/doom_whisperer.txt
@@ -5,4 +5,5 @@ PT:6/6
 K:Flying
 K:Trample
 A:AB$ Surveil | Cost$ PayLife<2> | Amount$ 2 | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Flying, trample\nPay 2 life: Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/d/dream_eater.txt b/forge-gui/res/cardsfolder/d/dream_eater.txt
index fddbdb90ac9..99a06b972ac 100644
--- a/forge-gui/res/cardsfolder/d/dream_eater.txt
+++ b/forge-gui/res/cardsfolder/d/dream_eater.txt
@@ -8,4 +8,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 4 | SubAbility$ TrigImmediate
 SVar:TrigImmediate:DB$ ImmediateTrigger | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ When you do, you may return target nonland permanent an opponent controls to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Origin$ Battlefield | Destination$ Hand
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Flash\nFlying\nWhen Dream Eater enters the battlefield, surveil 4. When you do, you may return target nonland permanent an opponent controls to its owner's hand. (To surveil 4, look at the top four cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/d/drowned_secrets.txt b/forge-gui/res/cardsfolder/d/drowned_secrets.txt
index 2bf1b893bc0..55e3fdba195 100644
--- a/forge-gui/res/cardsfolder/d/drowned_secrets.txt
+++ b/forge-gui/res/cardsfolder/d/drowned_secrets.txt
@@ -4,4 +4,5 @@ Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever you cast a blue spell, target player puts the top two cards if their library into their graveyard.
 SVar:TrigMill:DB$Mill | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Select target player
 SVar:BuffedBy:Card.Blue
+DeckHas:Ability$Graveyard
 Oracle:Whenever you cast a blue spell, target player puts the top two cards if their library into their graveyard.
diff --git a/forge-gui/res/cardsfolder/e/electrostatic_field.txt b/forge-gui/res/cardsfolder/e/electrostatic_field.txt
index fbb8fdd3b2d..21044c85700 100644
--- a/forge-gui/res/cardsfolder/e/electrostatic_field.txt
+++ b/forge-gui/res/cardsfolder/e/electrostatic_field.txt
@@ -5,4 +5,5 @@ PT:0/4
 K:Defender
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ When you cast an instant or sorcery spell, CARDNAME deals 1 damage to each opponent.
 SVar:TrigDealDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 1
+DeckHints:Type$Instant|Sorcery
 Oracle:Defender\nWhen you cast an instant or sorcery spell, Electrostatic Field deals 1 damage to each opponent.
diff --git a/forge-gui/res/cardsfolder/e/emmara_soul_of_the_accord.txt b/forge-gui/res/cardsfolder/e/emmara_soul_of_the_accord.txt
index 44da9af66e5..4c998fe93ce 100644
--- a/forge-gui/res/cardsfolder/e/emmara_soul_of_the_accord.txt
+++ b/forge-gui/res/cardsfolder/e/emmara_soul_of_the_accord.txt
@@ -4,4 +4,5 @@ Types:Legendary Creature Elf Cleric
 PT:2/2
 T:Mode$ Taps | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME becomes tapped, create a 1/1 white Soldier creature token with lifelink.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier_lifelink
+DeckHas:Ability$Token
 Oracle:Whenever Emmara, Soul of the Accord becomes tapped, create a 1/1 white Soldier creature token with lifelink.
diff --git a/forge-gui/res/cardsfolder/e/enhanced_surveillance.txt b/forge-gui/res/cardsfolder/e/enhanced_surveillance.txt
index d8bb73b521c..e1f2f07462c 100644
--- a/forge-gui/res/cardsfolder/e/enhanced_surveillance.txt
+++ b/forge-gui/res/cardsfolder/e/enhanced_surveillance.txt
@@ -5,4 +5,5 @@ R:Event$ Surveil | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ Ad
 SVar:AddTwoMore:DB$ ReplaceEffect | VarName$ SurveilNum | VarValue$ X | References$ X
 SVar:X:ReplaceCount$SurveilNum/Plus.2
 A:AB$ ChangeZoneAll | Cost$ Exile<1/CARDNAME> | ChangeType$ Card.YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True | SpellDescription$ Shuffle your graveyard into your library.
+DeckNeeds:Ability$Surveil
 Oracle:You may look at an additional two cards each you surveil.\nExile Enhanced Surveillance: Shuffle your graveyard into your library.
diff --git a/forge-gui/res/cardsfolder/e/erratic_cyclops.txt b/forge-gui/res/cardsfolder/e/erratic_cyclops.txt
index 269664a5423..38c790f9854 100644
--- a/forge-gui/res/cardsfolder/e/erratic_cyclops.txt
+++ b/forge-gui/res/cardsfolder/e/erratic_cyclops.txt
@@ -7,4 +7,5 @@ T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Tr
 SVar:TrigPump:DB$ Pump | NumAtt$ +X | References$ X
 SVar:X:TriggerCount$CastSACMC
 SVar:BuffedBy:Instant,Sorcery
+DeckHints:Type$Instant|Sorcery
 Oracle:Trample\nWhenever you cast an instant or sorcery spell, Erratic Cyclops gets +X/+0 until end of turn, where X is that spell's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/f/find_finality.txt b/forge-gui/res/cardsfolder/f/find_finality.txt
index 28a07e6d50f..2b85d2313fd 100644
--- a/forge-gui/res/cardsfolder/f/find_finality.txt
+++ b/forge-gui/res/cardsfolder/f/find_finality.txt
@@ -14,4 +14,5 @@ A:SP$ ChooseCard | Cost$ 4 B G | Defined$ You | Amount$ 1 | MinAmount$ 0 | Choic
 SVar:DBPutCounter:DB$ PutCounter | Defined$ ChosenCard | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPumpAll
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
+DeckHas:Ability$Counters
 Oracle:You may put two +1/+1 counters on a creature you control. Then all creatures get -4/-4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/fire_urchin.txt b/forge-gui/res/cardsfolder/f/fire_urchin.txt
index 4e4e22a9def..02cc79bb57e 100644
--- a/forge-gui/res/cardsfolder/f/fire_urchin.txt
+++ b/forge-gui/res/cardsfolder/f/fire_urchin.txt
@@ -6,4 +6,5 @@ K:Trample
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery spell, CARDNAME gets +1/+0 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 1
 SVar:BuffedBy:Instant,Sorcery
+DeckHints:Type$Instant|Sorcery
 Oracle:Trample\nWhenever you cast an instant or sorcery spell, Fire Urchin gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/fireminds_research.txt b/forge-gui/res/cardsfolder/f/fireminds_research.txt
index b2a23c01b04..fc7c35836ce 100644
--- a/forge-gui/res/cardsfolder/f/fireminds_research.txt
+++ b/forge-gui/res/cardsfolder/f/fireminds_research.txt
@@ -8,4 +8,5 @@ DeckHints:Type$Instant | Sorcery
 A:AB$ Draw | Cost$ 1 U SubCounter<2/CHARGE> | NumCards$ 1 | SpellDescription$ Draw a card.
 A:AB$ DealDamage | Cost$ 1 R SubCounter<5/CHARGE> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to any target.
 SVar:RemRandomDeck:True
+DeckNeeds:Type$Instant|Sorcery
 Oracle:Whenever you cast an instant or sorcery spell, put a charge counter on Firemind's Research.\n{1}{U}, Remove two charge counters from Firemind's Research: Draw a card.\n{1}{R}, Remove five charge counters from Firemind's Research: It deals 5 damage to any target.
diff --git a/forge-gui/res/cardsfolder/g/gird_for_battle.txt b/forge-gui/res/cardsfolder/g/gird_for_battle.txt
index 305c43656e3..0f10b839ce2 100644
--- a/forge-gui/res/cardsfolder/g/gird_for_battle.txt
+++ b/forge-gui/res/cardsfolder/g/gird_for_battle.txt
@@ -2,4 +2,5 @@ Name:Gird for Battle
 ManaCost:W
 Types:Sorcery
 A:SP$ PutCounter | Cost$ W | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 2 | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each of up to two target creatures.
+DeckHas:Ability$Counters
 Oracle:Put a +1/+1 counter on each of up to two target creatures.
diff --git a/forge-gui/res/cardsfolder/g/glowspore_shaman.txt b/forge-gui/res/cardsfolder/g/glowspore_shaman.txt
index 518b808f7c1..c5c3d74e1e7 100644
--- a/forge-gui/res/cardsfolder/g/glowspore_shaman.txt
+++ b/forge-gui/res/cardsfolder/g/glowspore_shaman.txt
@@ -5,4 +5,5 @@ PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, put the top three cards of your library into your graveyard. You may put a land card from your graveyard on top of your library.
 SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | OptionalDecider$ You | ChangeType$ Land.YouOwn | ChangeNum$ 1 | Hidden$ True | Optional$ True
+DeckHas:Ability$Graveyard
 Oracle:When Glowspore Shaman enters the battlefield, put the top three cards of your library into your graveyard. You may put a land card from your graveyard on top of your library.
diff --git a/forge-gui/res/cardsfolder/g/goblin_banneret.txt b/forge-gui/res/cardsfolder/g/goblin_banneret.txt
index 5419f82bfbc..b1bcc1bccd3 100644
--- a/forge-gui/res/cardsfolder/g/goblin_banneret.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_banneret.txt
@@ -4,4 +4,5 @@ Types:Creature Goblin Soldier
 PT:1/1
 K:Mentor
 A:AB$ Pump | Cost$ 1 R | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
+DeckHas:Ability$Counters
 Oracle:Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\n{1}{R}: Goblin Banneret gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/golgari_raiders.txt b/forge-gui/res/cardsfolder/g/golgari_raiders.txt
index 2edb4dec836..68b269f346b 100644
--- a/forge-gui/res/cardsfolder/g/golgari_raiders.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_raiders.txt
@@ -6,4 +6,5 @@ K:Haste
 K:etbCounter:P1P1:X:no Condition:Undergrowth - CARDNAME enters the battlefield with a +1/+1 counter on it for each creature card in your graveyard.
 SVar:X:Count$LastStateGraveyard Creature.YouCtrl
 SVar:NeedsToPlayVar:X GE3
+DeckHas:Ability$Counters
 Oracle:Haste\nUndergrowth — Golgari Raiders enters the battlefield with a +1/+1 counter on it for each creature card in your graveyard.
diff --git a/forge-gui/res/cardsfolder/g/gruesome_menagerie.txt b/forge-gui/res/cardsfolder/g/gruesome_menagerie.txt
index 46c3ea0f004..8a28cd52744 100644
--- a/forge-gui/res/cardsfolder/g/gruesome_menagerie.txt
+++ b/forge-gui/res/cardsfolder/g/gruesome_menagerie.txt
@@ -6,4 +6,5 @@ SVar:DBChoose2:DB$ ChooseCard | Defined$ You | Choices$ Creature.YouOwn+cmcEQ2 |
 SVar:DBChoose3:DB$ ChooseCard | Defined$ You | Choices$ Creature.YouOwn+cmcEQ3 | ChoiceZone$ Graveyard | Amount$ 1 | SubAbility$ DBReturn | RememberChosen$ True | SpellDescription$ Choose a creature card with converted mana cost 3 in your graveyard.
 SVar:DBReturn:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:NeedsToPlay:Creature.YouCtrl+inZoneGraveyard+cmcLE3
 Oracle:Choose a creature card with converted mana cost 1 in your graveyard, then do the same for creature cards with converted mana costs 2 and 3. Return those cards to the battlefield.
diff --git a/forge-gui/res/cardsfolder/g/guildmages_forum.txt b/forge-gui/res/cardsfolder/g/guildmages_forum.txt
index 1eb1bca9658..0dfcfc4b524 100644
--- a/forge-gui/res/cardsfolder/g/guildmages_forum.txt
+++ b/forge-gui/res/cardsfolder/g/guildmages_forum.txt
@@ -2,4 +2,5 @@ Name:Guildmages' Forum
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ 1 T | Produced$ Any | AddsCounters$ Card.Creature+MultiColor_P1P1_1 | SpellDescription$ Add one mana of any color. If that mana is spent on a multicolored creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
+DeckHas:Ability$Counters
 Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color. If that mana is spent on a multicolored creature spell, that creature enters the battlefield with an additional +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/h/haazda_marshal.txt b/forge-gui/res/cardsfolder/h/haazda_marshal.txt
index 5eb0f677523..62edb4876d3 100644
--- a/forge-gui/res/cardsfolder/h/haazda_marshal.txt
+++ b/forge-gui/res/cardsfolder/h/haazda_marshal.txt
@@ -5,4 +5,5 @@ PT:1/1
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ AttackerTest | SVarCompare$ GE2 | NoResolvingCheck$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier_lifelink
 SVar:AttackerTest:Count$Valid Creature.attacking+Other
+DeckHas:Ability$Token
 Oracle:Whenever Haazda Marshal and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink.
diff --git a/forge-gui/res/cardsfolder/h/hammer_dropper.txt b/forge-gui/res/cardsfolder/h/hammer_dropper.txt
index d0d0d0a3193..dd2b2f37495 100644
--- a/forge-gui/res/cardsfolder/h/hammer_dropper.txt
+++ b/forge-gui/res/cardsfolder/h/hammer_dropper.txt
@@ -3,4 +3,5 @@ ManaCost:2 R W
 Types:Creature Giant Soldier
 PT:5/2
 K:Mentor
+DeckHas:Ability$Counters
 Oracle:Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)
diff --git a/forge-gui/res/cardsfolder/h/house_guildmage.txt b/forge-gui/res/cardsfolder/h/house_guildmage.txt
index 08847cc9e65..4a0c6f751c1 100644
--- a/forge-gui/res/cardsfolder/h/house_guildmage.txt
+++ b/forge-gui/res/cardsfolder/h/house_guildmage.txt
@@ -4,4 +4,5 @@ Types:Creature Human Wizard
 PT:2/2
 A:AB$ Pump | Cost$ 1 U T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | IsCurse$ True | SpellDescription$ Target creature doesn't untap during its controller's next untap step.
 A:AB$ Surveil | Cost$ 2 B T | Amount$ 2 | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:{1}{U}, {T}: Target creature doesn't untap during its controller's next untap step.\n{2}{B}, {T}: Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/i/invert_invent.txt b/forge-gui/res/cardsfolder/i/invert_invent.txt
index 9e5803db4e7..63f7d936e87 100644
--- a/forge-gui/res/cardsfolder/i/invert_invent.txt
+++ b/forge-gui/res/cardsfolder/i/invert_invent.txt
@@ -13,4 +13,5 @@ Types:Instant
 A:SP$ ChangeZone | Cost$ 4 U R | Origin$ Library | Destination$ Hand | ChangeType$ Instant | ChangeNum$ 1 | SubAbility$ DBChange | SpellDescription$ Search your library for and instant permanent and/or a sorcery card, reveal them, put them into your hand, then shuffle your library.
 SVar:DBChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Sorcery | ChangeNum$ 1 | Shuffle$ True
 SVar:RemRandomDeck:True
+DeckHints:Type$Instant|Sorcery
 Oracle:Search your library for an instant card and/or a sorcery card, reveal them, put them into your hand, then shuffle your library.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/i/ironshell_beetle.txt b/forge-gui/res/cardsfolder/i/ironshell_beetle.txt
index 39ad66852ba..6cde56e4cc5 100644
--- a/forge-gui/res/cardsfolder/i/ironshell_beetle.txt
+++ b/forge-gui/res/cardsfolder/i/ironshell_beetle.txt
@@ -4,5 +4,6 @@ Types:Creature Insect
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on target creature.
 SVar:TrigPut:DB$PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ironshell_beetle.jpg
 Oracle:When Ironshell Beetle enters the battlefield, put a +1/+1 counter on target creature.
diff --git a/forge-gui/res/cardsfolder/i/izoni_thousand_eyed.txt b/forge-gui/res/cardsfolder/i/izoni_thousand_eyed.txt
index c5fd38febe0..caf403eb29a 100644
--- a/forge-gui/res/cardsfolder/i/izoni_thousand_eyed.txt
+++ b/forge-gui/res/cardsfolder/i/izoni_thousand_eyed.txt
@@ -7,4 +7,5 @@ SVar:TrigToken:DB$Token | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creat
 SVar:X:Count$TypeInYourYard.Creature
 A:AB$ GainLife | Cost$ B G Sac<1/Creature.Other/another creature> | Defined$ You | LifeAmount$ 1 | SubAbility$ DBDraw | SpellDescription$ You gain 1 life and draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1
+DeckHas:Ability$Token
 Oracle:Undergrowth — When Izoni, Thousand-Eyed enters the battlefield, create a 1/1 black and green Insect creature token for each creature card in your graveyard.\n{B}{G}, Sacrifice another creature: You gain 1 life and draw a card.
diff --git a/forge-gui/res/cardsfolder/k/knight_of_autumn.txt b/forge-gui/res/cardsfolder/k/knight_of_autumn.txt
index 907e199df3c..773ea6207c9 100644
--- a/forge-gui/res/cardsfolder/k/knight_of_autumn.txt
+++ b/forge-gui/res/cardsfolder/k/knight_of_autumn.txt
@@ -7,4 +7,5 @@ SVar:TrigCharm:DB$ Charm | Choices$ DBPump,DBDestroy,DBGainLife
 SVar:DBPump:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on CARDNAME.
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 4 | SpellDescription$ You gain 4 life.
+DeckHas:Ability$Counters
 Oracle:When Knight of Autumn enters the battlefield, choose one —\n• Put two +1/+1 counters on Knight of Autumn.\n• Destroy target artifact or enchantment.\n• You gain 4 life.
diff --git a/forge-gui/res/cardsfolder/l/lazav_the_multifarious.txt b/forge-gui/res/cardsfolder/l/lazav_the_multifarious.txt
index 57ab5d3a9fa..374c88202d1 100644
--- a/forge-gui/res/cardsfolder/l/lazav_the_multifarious.txt
+++ b/forge-gui/res/cardsfolder/l/lazav_the_multifarious.txt
@@ -6,4 +6,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigSurveil:DB$ Surveil | Amount$ 1
 A:AB$ Clone | Cost$ X | ValidTgts$ Creature.YouOwn | References$ X | TgtZone$ Graveyard | TgtPrompt$ Select target creature card in your graveyard | AddTypes$ Legendary | NewName$ Lazav, the Multifarious | GainThisAbility$ True | SpellDescription$ CARDNAME becomes a copy of target creature card in your graveyard with converted mana cost X, except its name is CARDNAME, it's legendary in addition to it's other types, and it has this ability.
 SVar:X:Targeted$CardManaCost
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:When Lazav, the Multifarious enters the battlefield, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\n{X}: Lazav, the Multifarious becomes a copy of target creature card in your graveyard with converted mana cost X, except its name is Lazav, the Multifarious, it's legendary in addition to its other types, and it has this ability.
diff --git a/forge-gui/res/cardsfolder/l/league_guildmage.txt b/forge-gui/res/cardsfolder/l/league_guildmage.txt
index 1c07ac501bf..c0cdc4c664c 100644
--- a/forge-gui/res/cardsfolder/l/league_guildmage.txt
+++ b/forge-gui/res/cardsfolder/l/league_guildmage.txt
@@ -5,4 +5,5 @@ PT:2/2
 A:AB$ Draw | Cost$ 3 U T | NumCards$ 1 | SpellDescription$ Draw a card.
 A:AB$ CopySpellAbility | Cost$ X R T | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TargetType$ Spell | SpellDescription$ Copy target instant or sorcery spell you control with converted mana cost X. You may choose new targets for the copy.
 SVar:X:Targeted$CardManaCost
+DeckHints:Type$Instant|Sorcery
 Oracle:{3}{U}, {T}: Draw a card.\n{X}{R}, {T}: Copy target instant or sorcery spell you control with converted mana cost X. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/l/leapfrog.txt b/forge-gui/res/cardsfolder/l/leapfrog.txt
index 7a7ada2f5a2..345db3634bb 100644
--- a/forge-gui/res/cardsfolder/l/leapfrog.txt
+++ b/forge-gui/res/cardsfolder/l/leapfrog.txt
@@ -4,4 +4,5 @@ Types:Creature Frog
 PT:3/1
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME has flying as long as you've cast and instant or sorcery spell this turn.
 SVar:X:Count$ThisTurnCast_Instant.YouCtrl,Sorcery.YouCtrl
+DeckHints:Type$Instant|Sorcery
 Oracle:Leapfrog has flying as long as you've cast and instant or sorcery spell this turn.
diff --git a/forge-gui/res/cardsfolder/m/march_of_the_multitudes.txt b/forge-gui/res/cardsfolder/m/march_of_the_multitudes.txt
index 693f71a3d99..c9a7aac646e 100644
--- a/forge-gui/res/cardsfolder/m/march_of_the_multitudes.txt
+++ b/forge-gui/res/cardsfolder/m/march_of_the_multitudes.txt
@@ -4,4 +4,5 @@ Types:Instant
 K:Convoke
 A:SP$ Token | Cost$ X G W W | TokenAmount$ X | References$ X | TokenScript$ w_1_1_soldier_lifelink | SpellDescription$ Create X 1/1 white Soldier creature tokens with lifelink.
 SVar:X:Count$xPaid
+DeckHas:Ability$Token
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of the creature's color.)\nCreate X 1/1 white Soldier creature tokens with lifelink.
diff --git a/forge-gui/res/cardsfolder/m/mephitic_vapors.txt b/forge-gui/res/cardsfolder/m/mephitic_vapors.txt
index 20328c8009e..eeca0cc0668 100644
--- a/forge-gui/res/cardsfolder/m/mephitic_vapors.txt
+++ b/forge-gui/res/cardsfolder/m/mephitic_vapors.txt
@@ -3,4 +3,5 @@ ManaCost:2 B
 Types:Sorcery
 A:SP$ PumpAll | Cost$ 2 B | ValidCards$ Creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | Subability$ DBSurveil | SpellDescription$ All creatures get -1/-1 until end of turn.
 SVar:DBSurveil:DB$ Surveil | Amount$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:All creatures get -1/-1 until end of turn.\nSurveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/m/mission_briefing.txt b/forge-gui/res/cardsfolder/m/mission_briefing.txt
index 8c0d5ca1156..3fc8640f76e 100644
--- a/forge-gui/res/cardsfolder/m/mission_briefing.txt
+++ b/forge-gui/res/cardsfolder/m/mission_briefing.txt
@@ -9,5 +9,6 @@ SVar:ReplaceGraveyard:Event$ Moved | ValidCard$ Card.IsRemembered | Origin$ Stac
 SVar:MoveExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
+DeckHas:Ability$Surveil & Ability$Graveyard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mission_briefing.jpg
 Oracle:Surveil 2, then choose an instant or sorcery card in your graveyard. You may cast that card this turn. If that card would be put into your graveyard this turn, exile it instead.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/murmuring_mystic.txt b/forge-gui/res/cardsfolder/m/murmuring_mystic.txt
index e564cee9162..7947d0ef419 100644
--- a/forge-gui/res/cardsfolder/m/murmuring_mystic.txt
+++ b/forge-gui/res/cardsfolder/m/murmuring_mystic.txt
@@ -5,4 +5,6 @@ PT:1/5
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast an instant or sorcery spell, create a 1/1 blue Bird Illusion creature token with flying.
 SVar:TrigToken:DB$Token | TokenAmount$ 1 | TokenScript$ u_1_1_bird_illusion_flying
 SVar:BuffedBy:Instant,Sorcery
+DeckHints:Ability$Instant|Sorcery
+DeckHas:Ability$Token
 Oracle:Whenever you cast an instant or sorcery spell, create a 1/1 blue Bird Illusion creature token with flying.
diff --git a/forge-gui/res/cardsfolder/n/nightveil_sprite.txt b/forge-gui/res/cardsfolder/n/nightveil_sprite.txt
index 82043a4765a..bd2c50afe9f 100644
--- a/forge-gui/res/cardsfolder/n/nightveil_sprite.txt
+++ b/forge-gui/res/cardsfolder/n/nightveil_sprite.txt
@@ -6,4 +6,5 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 1
 SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Flying\nWhenever Nightveil Sprite attacks, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/n/niv_mizzet_parun.txt b/forge-gui/res/cardsfolder/n/niv_mizzet_parun.txt
index 5e02fcdb3b0..225b2a575c5 100644
--- a/forge-gui/res/cardsfolder/n/niv_mizzet_parun.txt
+++ b/forge-gui/res/cardsfolder/n/niv_mizzet_parun.txt
@@ -8,4 +8,5 @@ T:Mode$ Drawn | ValidCard$ Card.YouOwn | TriggerZones$ Battlefield | Execute$ Tr
 SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a player casts an instant or sorcery spell, you draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+DeckHints:Type$Instant|Sorcery
 Oracle:Niv-Mizzet, Parun can't be countered.\nFlying\nWhenever you draw a card, Niv-Mizzet, Parun deals 1 damage to any target.\nWhenever a player casts an instant or sorcery spell, you draw a card.
diff --git a/forge-gui/res/cardsfolder/n/notion_rain.txt b/forge-gui/res/cardsfolder/n/notion_rain.txt
index 2e49bc7cf74..c932c15d821 100644
--- a/forge-gui/res/cardsfolder/n/notion_rain.txt
+++ b/forge-gui/res/cardsfolder/n/notion_rain.txt
@@ -4,4 +4,5 @@ Types:Sorcery
 A:SP$ Surveil | Cost$ 1 U B | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2, then draw two cards. CARDNAME deals 2 damage to you.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Surveil 2, then draw two cards. Rain of Notions deals 2 damage to you. (To surveil 2, look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/parhelion_patrol.txt b/forge-gui/res/cardsfolder/p/parhelion_patrol.txt
index 35265bd259b..d4ed407ad8a 100644
--- a/forge-gui/res/cardsfolder/p/parhelion_patrol.txt
+++ b/forge-gui/res/cardsfolder/p/parhelion_patrol.txt
@@ -5,4 +5,5 @@ PT:2/3
 K:Flying
 K:Vigilance
 K:Mentor
+DeckHas:Ability$Counters
 Oracle:Flying, vigilance\nMentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)
diff --git a/forge-gui/res/cardsfolder/p/pelt_collector.txt b/forge-gui/res/cardsfolder/p/pelt_collector.txt
index 1057ed08c4e..56e8b90ad45 100644
--- a/forge-gui/res/cardsfolder/p/pelt_collector.txt
+++ b/forge-gui/res/cardsfolder/p/pelt_collector.txt
@@ -7,4 +7,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creatu
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+powerGTX+Other | References$ X | TriggerZones$ Battlefield | Secondary$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control enters the battlefield or dies, if that creature's power is greater than CARDNAME's, put a +1/+1 counter on CARDNAME.
 SVar:X:Count$CardPower
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 Oracle:Whenever another creature you control enters the battlefield or dies, if that creature's power is greater than Pelt Collector's, put a +1/+1 counter on Pelt Collector.\nAs long as Pelt Collector has three or more +1/+1 counters on it, it has trample.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt b/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
index 6382caaec7c..c632d6cad7b 100644
--- a/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
+++ b/forge-gui/res/cardsfolder/p/piston_fist_cyclops.txt
@@ -6,4 +6,5 @@ K:Defender
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you've cast an instant or sorcery spell this turn, CARDNAME can attack as though it didn't have defender.
 SVar:X:Count$ThisTurnCast_Instant.YouOwn,Sorcery.YouOwn
 SVar:BuffedBy:Instant,Sorcery
+DeckHints:Type$Instant|Sorcery
 Oracle:Defender\nAs long as you've cast an instant or sorcery spell this turn, Piston-Fist Cyclops can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/p/price_of_fame.txt b/forge-gui/res/cardsfolder/p/price_of_fame.txt
index 4383c468503..83fd2baf529 100644
--- a/forge-gui/res/cardsfolder/p/price_of_fame.txt
+++ b/forge-gui/res/cardsfolder/p/price_of_fame.txt
@@ -6,4 +6,5 @@ A:SP$ Destroy | Cost$ 3 B | ValidTgts$ Creature | SubAbility$ DBSurveil | TgtPro
 SVar:CostReduction:Count$Compare CheckTgt GE1.2.0
 SVar:CheckTgt:Targeted$Valid Creature.Legendary
 SVar:DBSurveil:DB$ Surveil | Amount$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:This spell costs {2} less to cast if it targets a legendary creature.\nDestroy target creature.\nSurveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/r/ral_izzet_viceroy.txt b/forge-gui/res/cardsfolder/r/ral_izzet_viceroy.txt
index 82e83d9f78b..1383177de97 100644
--- a/forge-gui/res/cardsfolder/r/ral_izzet_viceroy.txt
+++ b/forge-gui/res/cardsfolder/r/ral_izzet_viceroy.txt
@@ -12,4 +12,6 @@ SVar:TrigSpellCast:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatin
 SVar:EffSpellCast:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 4 | SubAbility$ EffDraw
 SVar:EffDraw:DB$ Draw | Defined$ You | NumCards$ 2
 SVar:BuffedBy:Instant,Sorcery
+DeckHints:Type$Instant|Sorcery
+DeckHas:Ability$Graveyard
 Oracle:[+1]: Look at the top two cards of your library. Put one of them into your hand and the other into your graveyard.\n[-3]: Ral, Izzet Viceroy deals damage to target creature equal to the total number of instant and sorcery cards you own in exile and in your graveyard.\n[-8]: You get an emblem with "Whenever you cast an instant or sorcery spell, this emblem deals 4 damage to any target and you draw two cards."
diff --git a/forge-gui/res/cardsfolder/r/rals_staticaster.txt b/forge-gui/res/cardsfolder/r/rals_staticaster.txt
index 10dee68d58c..1c179895b30 100644
--- a/forge-gui/res/cardsfolder/r/rals_staticaster.txt
+++ b/forge-gui/res/cardsfolder/r/rals_staticaster.txt
@@ -7,4 +7,5 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | IsPresent$ Planeswa
 SVar:TrigPump:DB$ Pump | NumAtt$ X | References$ X
 SVar:X:Count$InYourHand
 SVar:BuffedBy:Ral
+DeckNeeds:Type$Ral
 Oracle:Trample (This creature can deal excess combat damage to the player or planeswalker it's attacking.)\nWhenever Ral's Staticaster attacks, if you control a Ral planeswalker, Ral's Staticaster gets +1/+0 for each card in your hand until end of turn.
diff --git a/forge-gui/res/cardsfolder/r/rampaging_monument.txt b/forge-gui/res/cardsfolder/r/rampaging_monument.txt
index 82bd021bbef..b5b7db7fb21 100644
--- a/forge-gui/res/cardsfolder/r/rampaging_monument.txt
+++ b/forge-gui/res/cardsfolder/r/rampaging_monument.txt
@@ -7,4 +7,5 @@ K:etbCounter:P1P1:3
 T:Mode$ SpellCast | ValidCard$ Card.MultiColor | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a multicolored spell, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Card.MultiColor
+DeckHas:Ability$Counters
 Oracle:Trample\nRampaging Monument enters the battlefield with three +1/+1 counters on it.\nWhenever you cast a multicolored spell, put a +1/+1 counter on Rampaging Monument.
diff --git a/forge-gui/res/cardsfolder/r/rhizome_lurcher.txt b/forge-gui/res/cardsfolder/r/rhizome_lurcher.txt
index cee27cca260..0d374e6d17c 100644
--- a/forge-gui/res/cardsfolder/r/rhizome_lurcher.txt
+++ b/forge-gui/res/cardsfolder/r/rhizome_lurcher.txt
@@ -5,4 +5,5 @@ PT:2/2
 K:etbCounter:P1P1:X:no Condition:Undergrowth - CARDNAME enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in your graveyard.
 SVar:X:Count$TypeInYourYard.Creature
 SVar:NeedsToPlayVar:X GE1
+DeckHas:Ability$Counters
 Oracle:Undergrowth — Rhizome Lurcher enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/r/runaway_steam_kin.txt b/forge-gui/res/cardsfolder/r/runaway_steam_kin.txt
index f43e7afe1e2..5c70f04198e 100644
--- a/forge-gui/res/cardsfolder/r/runaway_steam_kin.txt
+++ b/forge-gui/res/cardsfolder/r/runaway_steam_kin.txt
@@ -5,4 +5,5 @@ PT:1/1
 T:Mode$ SpellCast | ValidCard$ Card.Red | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Card.Self+counters_LE2_P1P1 | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a red spell, if CARDNAME has fewer than three +1/+1 counters on it, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ Mana | Cost$ SubCounter<3/P1P1> | Produced$ R | Amount$ 3 | SpellDescription$ Add {R}{R}{R}.
+DeckHas:Ability$Counters
 Oracle:Whenever you cast a red spell, if Runaway Steam-Kin has fewer than three +1/+1 counters on it, put a +1/+1 counter on Runaway Steam-Kin.\nRemove three +1/+1 counters from Runaway Steam-Kin: Add {R}{R}{R}.
diff --git a/forge-gui/res/cardsfolder/s/sinister_sabotage.txt b/forge-gui/res/cardsfolder/s/sinister_sabotage.txt
index 5dcbd3c772a..26b0076b909 100644
--- a/forge-gui/res/cardsfolder/s/sinister_sabotage.txt
+++ b/forge-gui/res/cardsfolder/s/sinister_sabotage.txt
@@ -3,4 +3,5 @@ ManaCost:1 U U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | Subability$ DBSurveil | SpellDescription$ Counter target spell. Surveil 1 (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:DBSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Counter target spell.\nSurveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/s/smelt_ward_minotaur.txt b/forge-gui/res/cardsfolder/s/smelt_ward_minotaur.txt
index 8c51a87d9a2..3c563b2f46a 100644
--- a/forge-gui/res/cardsfolder/s/smelt_ward_minotaur.txt
+++ b/forge-gui/res/cardsfolder/s/smelt_ward_minotaur.txt
@@ -5,5 +5,5 @@ PT:2/3
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery spell, target creature an opponent controls can't block this turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True
 SVar:BuffedBy:Instant,Sorcery
-DeckHints:Type$Instant | Sorcery
+DeckHints:Type$Instant|Sorcery
 Oracle:Whenever you cast an instant or sorcery spell, target creature an opponent controls can't block this turn.
diff --git a/forge-gui/res/cardsfolder/s/sprouting_renewal.txt b/forge-gui/res/cardsfolder/s/sprouting_renewal.txt
index 133ca46ab57..9f75927afbd 100644
--- a/forge-gui/res/cardsfolder/s/sprouting_renewal.txt
+++ b/forge-gui/res/cardsfolder/s/sprouting_renewal.txt
@@ -5,4 +5,5 @@ K:Convoke
 A:SP$ Charm | Cost$ 2 G | Choices$ DBToken,DBDestroy
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ wg_2_2_elf_knight_vigilance | SpellDescription$ Create a 2/2 green and white Elf Knight creature token with vigilance.
+DeckHas:Ability$Token
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nChoose one —\n• Create a 2/2 green and white Elf Knight creature token with vigilance.\n• Destroy target artifact or enchantment.
diff --git a/forge-gui/res/cardsfolder/s/sunhome_stalwart.txt b/forge-gui/res/cardsfolder/s/sunhome_stalwart.txt
index 108c54611cd..3619e11a263 100644
--- a/forge-gui/res/cardsfolder/s/sunhome_stalwart.txt
+++ b/forge-gui/res/cardsfolder/s/sunhome_stalwart.txt
@@ -4,4 +4,5 @@ Types:Creature Human Soldier
 PT:2/2
 K:First Strike
 K:Mentor
+DeckHas:Ability$Counters
 Oracle:First strike\nMentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)
diff --git a/forge-gui/res/cardsfolder/t/tajic_legions_edge.txt b/forge-gui/res/cardsfolder/t/tajic_legions_edge.txt
index 4fd9fb0b3a4..dc2adc1103c 100644
--- a/forge-gui/res/cardsfolder/t/tajic_legions_edge.txt
+++ b/forge-gui/res/cardsfolder/t/tajic_legions_edge.txt
@@ -6,4 +6,5 @@ K:Haste
 K:Mentor
 R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ Creature.Other+YouCtrl | IsCombat$ False | Description$ Prevent all noncombat damage that would be dealt to other creatures you control.
 A:AB$ Pump | Cost$ R W | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
+DeckHas:Ability$Counters
 Oracle:Haste\nMentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\nPrevent all noncombat damage that would be dealt to other creatures you control.\n{R}{W}: Tajic, Legion's Edge gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/thought_erasure.txt b/forge-gui/res/cardsfolder/t/thought_erasure.txt
index 02aab8b1c92..57bdc88fe1c 100644
--- a/forge-gui/res/cardsfolder/t/thought_erasure.txt
+++ b/forge-gui/res/cardsfolder/t/thought_erasure.txt
@@ -3,4 +3,5 @@ ManaCost:U B
 Types:Sorcery
 A:SP$ Discard | Cost$ U B | ValidTgts$ Opponent | DiscardValid$ Card.nonLand | NumCards$ 1 | Mode$ RevealYouChoose | Subability$ DBSurveil | SpellDescription$ Target opponent reveals their hand. You choose a nonland card from it. That player discards that card. Surveil 1 (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:DBSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Target opponent reveals their hand. You choose a nonland card from it. That player discards that card.\nSurveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/t/thoughtbound_phantasm.txt b/forge-gui/res/cardsfolder/t/thoughtbound_phantasm.txt
index 718268ba991..f2c53932858 100644
--- a/forge-gui/res/cardsfolder/t/thoughtbound_phantasm.txt
+++ b/forge-gui/res/cardsfolder/t/thoughtbound_phantasm.txt
@@ -6,4 +6,6 @@ K:Defender
 T:Mode$ Surveil | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you surveil, put a +1/+1 counter on CARDNAME
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE3_P1P1 | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | Description$ As long as CARDNAME has three or more +1/+1 counters on it, it can attack
+DeckNeeds:Ability$Surveil
+DeckHas:Ability$Counters
 Oracle:Defender\nWhenever you surveil, put a +1/+1 counter on Thoughtbound Phantasm.\nAs long as Thoughtbound Phantasm has three or more +1/+1 counters on it, it can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/t/thousand_year_storm.txt b/forge-gui/res/cardsfolder/t/thousand_year_storm.txt
index 2ca167294a7..e4425747b73 100644
--- a/forge-gui/res/cardsfolder/t/thousand_year_storm.txt
+++ b/forge-gui/res/cardsfolder/t/thousand_year_storm.txt
@@ -4,4 +4,5 @@ Types:Enchantment
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an instant or sorcery spell, copy it for each other instant and sorcery spell you've cast before it this turn. You may choose new targets for the copies.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Amount$ X | References$ X
 SVar:X:TriggerObjectsCurrentCastSpells$Valid Sorcery.YouCtrl,Instant.YouCtrl/Minus.1
+DeckHints:Type$Instant|Sorcery
 Oracle:Whenever you cast an instant or sorcery spell, copy it for each other instant and sorcery spell you've cast before it this turn. You may choose new targets for the copies.
diff --git a/forge-gui/res/cardsfolder/t/trostani_discordant.txt b/forge-gui/res/cardsfolder/t/trostani_discordant.txt
index 53c3ed895e4..a6c268ead08 100644
--- a/forge-gui/res/cardsfolder/t/trostani_discordant.txt
+++ b/forge-gui/res/cardsfolder/t/trostani_discordant.txt
@@ -8,4 +8,5 @@ SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier_lifelink
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ At the beginning of your end step, each player gains control of all creatures they own.
 SVar:TrigGainControl:DB$ RepeatEach | RepeatPlayers$ Player | AILogic$ GainControlOwns | RepeatSubAbility$ DBGainControl | SpellDescription$ Each player gains control of all creatures they own.
 SVar:DBGainControl:DB$ GainControl | AllValid$ Creature.RememberedPlayerOwn | NewController$ Player.IsRemembered
+DeckHas:Ability$Token
 Oracle:Other creatures you control get +1/+1.\nWhen Trostani Discordant enters the battlefield, create two 1/1 white Soldier creature tokens with lifelink.\nAt the beginning of your end step, each player gains control of all creatures they own.
diff --git a/forge-gui/res/cardsfolder/t/truefire_captain.txt b/forge-gui/res/cardsfolder/t/truefire_captain.txt
index 9686427b472..3c254c3ef0f 100644
--- a/forge-gui/res/cardsfolder/t/truefire_captain.txt
+++ b/forge-gui/res/cardsfolder/t/truefire_captain.txt
@@ -7,4 +7,5 @@ T:Mode$ DamageDoneOnce | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZ
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:HasCombatEffect:TRUE
+DeckHas:Ability$Counters
 Oracle:Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\nWhenever Truefire Captain is dealt damage, it deals that much damage to target player.
diff --git a/forge-gui/res/cardsfolder/u/unexplained_disappearance.txt b/forge-gui/res/cardsfolder/u/unexplained_disappearance.txt
index 5f90caabb59..761e0b83aea 100644
--- a/forge-gui/res/cardsfolder/u/unexplained_disappearance.txt
+++ b/forge-gui/res/cardsfolder/u/unexplained_disappearance.txt
@@ -3,4 +3,5 @@ ManaCost:1 U
 Types:Instant
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand | Subability$ DBSurveil | SpellDescription$ Return target creature to its owner's hand. Surveil 1 (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:DBSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Return target creature to its owner's hand.\nSurveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/v/venerated_loxodon.txt b/forge-gui/res/cardsfolder/v/venerated_loxodon.txt
index f5add8bf2ce..09f861fd655 100644
--- a/forge-gui/res/cardsfolder/v/venerated_loxodon.txt
+++ b/forge-gui/res/cardsfolder/v/venerated_loxodon.txt
@@ -5,4 +5,5 @@ PT:4/4
 K:Convoke
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on each creature that convoked it.
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.convoked | CounterType$ P1P1 | CounterNum$ 1
+DeckHas:Ability$Counters
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of the creature's color.)\nWhen Venerated Loxodon enters the battlefield, put a +1/+1 counter on each creature that convoked it.
diff --git a/forge-gui/res/cardsfolder/v/vraska_regal_gorgon.txt b/forge-gui/res/cardsfolder/v/vraska_regal_gorgon.txt
index af5df6d1ba6..97a352881c4 100644
--- a/forge-gui/res/cardsfolder/v/vraska_regal_gorgon.txt
+++ b/forge-gui/res/cardsfolder/v/vraska_regal_gorgon.txt
@@ -7,4 +7,5 @@ SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Menace
 A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
 A:AB$ PutCounterAll | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ X | Reference$ X | SpellDescription$ For each creature card in your graveyard, put a +1/+1 counter on each creature you control.
 SVar:X:Count$ValidGraveyard Creature.YouCtrl
+DeckHas:Ability$Counters
 Oracle:[+2]: Put a +1/+1 counter on up to one target creature. That creature gains menace until end of turn.\n[-3]: Destroy target creature.\n[-10]: For each creature card in your graveyard, put a +1/+1 counter on each creature you control.
diff --git a/forge-gui/res/cardsfolder/w/wand_of_vertebrae.txt b/forge-gui/res/cardsfolder/w/wand_of_vertebrae.txt
index f110a982d8d..bea9f97917b 100644
--- a/forge-gui/res/cardsfolder/w/wand_of_vertebrae.txt
+++ b/forge-gui/res/cardsfolder/w/wand_of_vertebrae.txt
@@ -3,4 +3,5 @@ ManaCost:1
 Types:Artifact
 A:AB$ Mill | Cost$ T | Defined$ You | NumCards$ 1 | SpellDescription$ Put the top card of your library into your graveyard.
 A:AB$ ChangeZone | Cost$ 2 T Exile<1/CARDNAME> | Origin$ Graveyard | Destination$ Library | TargetMin$ 0 | TargetMax$ 5 | Shuffle$ True | TgtPrompt$ Select target card in your graveyard | ValidTgts$ Card.YouCtrl | SpellDescription$ Shuffle up to five target cards from your graveyard into your library.
+DeckHas:Ability$Graveyard
 Oracle:{T}: Put the top card of your library into your graveyard.\n{2}, {T}, Exile Wand of Vertebrae: Shuffle up to five target cards from your graveyard into your library.
diff --git a/forge-gui/res/cardsfolder/w/watcher_in_the_mist.txt b/forge-gui/res/cardsfolder/w/watcher_in_the_mist.txt
index ba3f6aa313e..e2caac36008 100644
--- a/forge-gui/res/cardsfolder/w/watcher_in_the_mist.txt
+++ b/forge-gui/res/cardsfolder/w/watcher_in_the_mist.txt
@@ -5,4 +5,5 @@ PT:3/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
 SVar:TrigSurveil:DB$ Surveil | Defined$ You | Amount$ 2
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Flying\nWhen Watcher in the Mist enters the battlefield, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on the top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/w/wee_dragonauts.txt b/forge-gui/res/cardsfolder/w/wee_dragonauts.txt
index 029b30cf7d6..ca007c6b11c 100644
--- a/forge-gui/res/cardsfolder/w/wee_dragonauts.txt
+++ b/forge-gui/res/cardsfolder/w/wee_dragonauts.txt
@@ -6,5 +6,6 @@ K:Flying
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery spell, CARDNAME gets +2/+0 until end of turn.
 SVar:TrigPump:DB$Pump | Defined$ Self | NumAtt$ 2
 SVar:BuffedBy:Instant,Sorcery
+DeckHints:Type$Instant|Sorcery
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wee_dragonauts.jpg
 Oracle:Flying\nWhenever you cast an instant or sorcery spell, Wee Dragonauts gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/w/whisper_agent.txt b/forge-gui/res/cardsfolder/w/whisper_agent.txt
index b681e45523c..8ed6266614a 100644
--- a/forge-gui/res/cardsfolder/w/whisper_agent.txt
+++ b/forge-gui/res/cardsfolder/w/whisper_agent.txt
@@ -5,4 +5,5 @@ PT:3/2
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil & Ability$Graveyard
 Oracle:Flash\nWhen Whisper Agent enters the battlefield, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/w/whispering_snitch.txt b/forge-gui/res/cardsfolder/w/whispering_snitch.txt
index d14a81ca909..3ae5c96b86e 100644
--- a/forge-gui/res/cardsfolder/w/whispering_snitch.txt
+++ b/forge-gui/res/cardsfolder/w/whispering_snitch.txt
@@ -5,5 +5,6 @@ PT:1/3
 T:Mode$ Surveil | ValidPlayer$ You | TriggerZones$ Battlefield | OnlyFirst$ True | Execute$ TrigDamageAll | TriggerDescription$ Whenever you surveil for the first time each turn, CARDNAME deals 1 damage to each opponent and you gain 1 life.
 SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+DeckNeeds:Ability$Surveil
 DeckHas:Ability$LifeGain
 Oracle:Whenever you surveil for the first time each turn, Whispering Snitch deals 1 damage to each opponent and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/w/wojek_bodyguard.txt b/forge-gui/res/cardsfolder/w/wojek_bodyguard.txt
index 99a850f5738..10290fc1976 100644
--- a/forge-gui/res/cardsfolder/w/wojek_bodyguard.txt
+++ b/forge-gui/res/cardsfolder/w/wojek_bodyguard.txt
@@ -4,4 +4,5 @@ Types:Creature Human Soldier
 PT:3/3
 K:Mentor
 K:CARDNAME can't attack or block alone.
+DeckHas:Ability$Counters
 Oracle:Mentor (Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power.)\nWojek Bodyguard can't attack or block alone.
diff --git a/forge-gui/res/cardsfolder/w/worldsoul_colossus.txt b/forge-gui/res/cardsfolder/w/worldsoul_colossus.txt
index 65cc976eb40..959f30246da 100644
--- a/forge-gui/res/cardsfolder/w/worldsoul_colossus.txt
+++ b/forge-gui/res/cardsfolder/w/worldsoul_colossus.txt
@@ -5,4 +5,5 @@ PT:0/0
 K:Convoke
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
+DeckHas:Ability$Counters
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nWorldsoul Colossus enters the battlefield with X +1/+1 counters on it.