diff --git a/forge-gui/res/cardsfolder/m/moorland_haunt.txt b/forge-gui/res/cardsfolder/m/moorland_haunt.txt
index 1c60e751637..fa17fe49596 100644
--- a/forge-gui/res/cardsfolder/m/moorland_haunt.txt
+++ b/forge-gui/res/cardsfolder/m/moorland_haunt.txt
@@ -2,8 +2,7 @@ Name:Moorland Haunt
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Token | Cost$ W U T ExileFromGrave<1/Creature> | LegacyImage$ w 1 1 spirit flying isd | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You | SpellDescription$ Create a 1/1 white Spirit creature token with flying.
+A:AB$ Token | Cost$ W U T ExileFromGrave<1/Creature> | CostDesc$ {W}{U}, {T}, Exile a creature card from your graveyard: | TokenScript$ w_1_1_spirit_flying | SpellDescription$ Create a 1/1 white Spirit creature token with flying.
 DeckNeeds:Color$White|Blue
 DeckHas:Ability$Mana.Colorless & Ability$Token
-SVar:Picture:http://www.wizards.com/global/images/magic/general/moorland_haunt.jpg
 Oracle:{T}: Add {C}.\n{W}{U}, {T}, Exile a creature card from your graveyard: Create a 1/1 white Spirit creature token with flying.
diff --git a/forge-gui/res/cardsfolder/t/tamiyo_collector_of_tales.txt b/forge-gui/res/cardsfolder/t/tamiyo_collector_of_tales.txt
index bd85438b543..1380f040bd0 100644
--- a/forge-gui/res/cardsfolder/t/tamiyo_collector_of_tales.txt
+++ b/forge-gui/res/cardsfolder/t/tamiyo_collector_of_tales.txt
@@ -3,8 +3,9 @@ ManaCost:2 G U
 Types:Legendary Planeswalker Tamiyo
 Loyalty:5
 S:Mode$ Continuous | Affected$ You | AddKeyword$ Spells and abilities your opponents control can't cause you to discard cards. & Spells and abilities your opponents control can't cause you to sacrifice permanents. | Description$ Spells and abilities your opponents control can't cause you to discard cards or sacrifice permanents.
-A:AB$ NameCard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | SubAbility$ DBDig | SpellDescription$ Choose a nonland card name, then reveal the top four cards of your library. Put all cards with the chosen name from among them into your hand and the rest into your graveyard.
+A:AB$ NameCard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | ValidCards$ Card.nonLand | SubAbility$ DBDig | StackDescription$ SpellDescription | SpellDescription$ Choose a nonland card name, then reveal the top four cards of your library. Put all cards with the chosen name from among them into your hand and the rest into your graveyard.
 SVar:DBDig:DB$Dig | DigNum$ 4 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card.NamedCard | DestinationZone2$ Graveyard
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | TgtPrompt$ Choose target card in your graveyard | ValidTgts$ Card.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target card from your graveyard to your hand.
 AI:RemoveDeck:All
+DeckHas:Ability$Graveyard
 Oracle:Spells and abilities your opponents control can't cause you to discard cards or sacrifice permanents.\n[+1]: Choose a nonland card name, then reveal the top four cards of your library. Put all cards with the chosen name from among them into your hand and the rest into your graveyard.\n[−3]: Return target card from your graveyard to your hand.