diff --git a/forge-gui/res/cardsfolder/b/bell_borca_spectral_sergeant.txt b/forge-gui/res/cardsfolder/b/bell_borca_spectral_sergeant.txt
index 94fab640e16..a8e2e1b16ce 100644
--- a/forge-gui/res/cardsfolder/b/bell_borca_spectral_sergeant.txt
+++ b/forge-gui/res/cardsfolder/b/bell_borca_spectral_sergeant.txt
@@ -3,7 +3,7 @@ ManaCost:2 R W
 Types:Legendary Creature Spirit Soldier
 PT:*/5
 Text:Note the converted mana cost of each card as it's put into exile.
-T:Mode$ ChangesZone | Destination$ Exile | ValidCard$ Card | TriggerZones$ Battlefield | Execute$ TrigNoteNum | Static$ True
+T:Mode$ ChangesZone | Destination$ Exile | ValidCard$ Card.nonToken | TriggerZones$ Battlefield | Execute$ TrigNoteNum | Static$ True
 SVar:TrigNoteNum:DB$ StoreSVar | SVar$ ExiledCMC | Type$ Triggered | Expression$ CardManaCost | ConditionCheckSVar$ X | ConditionSVarCompare$ GTExiledCMC
 SVar:ExiledCMC:Number$0
 SVar:X:TriggeredCard$CardManaCost
diff --git a/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh_chandra_roaring_flame.txt b/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh_chandra_roaring_flame.txt
index 7defc079869..1df2a3699ab 100644
--- a/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh_chandra_roaring_flame.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh_chandra_roaring_flame.txt
@@ -22,7 +22,7 @@ Loyalty:4
 A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | Planeswalker$ True | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player or planeswalker
 A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | Planeswalker$ True | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
 A:AB$ DealDamage | Cost$ SubCounter<7/LOYALTY> | Defined$ Player.Opponent | Planeswalker$ True | Ultimate$ True | NumDmg$ 6 | RememberDamaged$ True | SubAbility$ DBUltimateEmblem | SpellDescription$ CARDNAME deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
-SVar:DBUltimateEmblem:DB$ Effect | Name$ Emblem - Chandra, Roaring Flame | Image$ emblem_chandra_roaring_flame | Stackable$ True | Triggers$ FlameTrigger | Duration$ Permanent | AILogic$ Always | EffectOwner$ Player.IsRemembered | SubAbility$ DBCleanup | SpellDescription$ Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
+SVar:DBUltimateEmblem:DB$ Effect | Name$ Emblem - Chandra, Roaring Flame | Image$ emblem_chandra_roaring_flame | Stackable$ True | Triggers$ FlameTrigger | Duration$ Permanent | AILogic$ Always | EffectOwner$ Player.IsRemembered | SubAbility$ DBCleanup
 SVar:FlameTrigger:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 3 damage to you.
 SVar:TrigDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/c/corpse_churn.txt b/forge-gui/res/cardsfolder/c/corpse_churn.txt
index b6a65ea4c75..3e5190c40f8 100644
--- a/forge-gui/res/cardsfolder/c/corpse_churn.txt
+++ b/forge-gui/res/cardsfolder/c/corpse_churn.txt
@@ -1,8 +1,7 @@
 Name:Corpse Churn
 ManaCost:1 B
 Types:Instant
-A:SP$ Mill | Cost$ 1 B | NumCards$ 3 | Defined$ You | SubAbility$ DBChooseCard | SpellDescription$ Mill three cards, then you may return a creature card from your graveyard to your hand. (To mill a card, put the top card of your library into your graveyard.)
-SVar:DBChooseCard:DB$ ChooseCard | Choices$ Creature.YouOwn | Optional$ Yes | ChoiceZone$ Graveyard | Amount$ 1 | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ ChosenCard
+A:SP$ Mill | Cost$ 1 B | NumCards$ 3 | Defined$ You | SubAbility$ DBChangeZone | SpellDescription$ Mill three cards, then you may return a creature card from your graveyard to your hand. (To mill a card, put the top card of your library into your graveyard.)
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.YouCtrl | ChangeNum$ 1 | Hidden$ True
 DeckHas:Ability$Graveyard
 Oracle:Mill three cards, then you may return a creature card from your graveyard to your hand. (To mill a card, put the top card of your library into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/g/grapple_with_the_past.txt b/forge-gui/res/cardsfolder/g/grapple_with_the_past.txt
index 56eddf0a47a..f8d1e06100b 100644
--- a/forge-gui/res/cardsfolder/g/grapple_with_the_past.txt
+++ b/forge-gui/res/cardsfolder/g/grapple_with_the_past.txt
@@ -1,9 +1,8 @@
 Name:Grapple with the Past
 ManaCost:1 G
 Types:Instant
-A:SP$ Mill | Cost$ 1 G | NumCards$ 3 | Defined$ You | SubAbility$ DBChooseCard | SpellDescription$ Mill three cards, then you may return a creature or land card from your graveyard to your hand.
-SVar:DBChooseCard:DB$ ChooseCard | Choices$ Creature.YouOwn,Land.YouOwn | Optional$ Yes | ChoiceZone$ Graveyard | Amount$ 1 | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ ChosenCard
+A:SP$ Mill | Cost$ 1 G | NumCards$ 3 | Defined$ You | SubAbility$ DBChangeZone | SpellDescription$ Mill three cards, then you may return a creature or land card from your graveyard to your hand.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.YouCtrl,Land.YouCtrl | ChangeNum$ 1 | Hidden$ True
 DeckHints:Ability$Delirium
 DeckHas:Ability$Graveyard
 Oracle:Mill three cards, then you may return a creature or land card from your graveyard to your hand.
diff --git a/forge-gui/res/formats/Digital/Historic.txt b/forge-gui/res/formats/Digital/Historic.txt
index d71911fed22..45aa2c1aaa1 100644
--- a/forge-gui/res/formats/Digital/Historic.txt
+++ b/forge-gui/res/formats/Digital/Historic.txt
@@ -4,5 +4,5 @@ Type:Digital
 Subtype:Arena
 Effective:2019-11-21
 Order:142
-Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AKR, ZNR, KLR, KHM
-Banned:Agent of Treachery; Field of the Dead; Fires of Invention; Oko, Thief of Crowns; Omnath, Locus of Creation; Nexus of Fate; Once Upon a Time; Teferi, Time Raveler; Veil of Summer; Uro, Titan of Nature's Wrath; Wilderness Reclamation; Winota, Joiner of Forces
+Sets:XLN, RIX, DOM, M19, GRN, G18, RNA, WAR, M20, ELD, HA1, THB, HA2, IKO, HA3, M21, JMP, AKR, ZNR, KLR, KHM, STX, STA
+Banned:Agent of Treachery; Channel; Counterspell; Dark Ritual; Demonic Tutor; Field of the Dead; Fires of Invention; Lightning Bolt; Oko, Thief of Crowns; Omnath, Locus of Creation; Natural Order; Nexus of Fate; Once Upon a Time; Swords to Plowshares; Teferi, Time Raveler; Veil of Summer; Uro, Titan of Nature's Wrath; Wilderness Reclamation; Winota, Joiner of Forces