diff --git a/forge-gui/res/cardsfolder/b/bear_umbra.txt b/forge-gui/res/cardsfolder/b/bear_umbra.txt
index 9c46d84b05a..72f945bdb69 100644
--- a/forge-gui/res/cardsfolder/b/bear_umbra.txt
+++ b/forge-gui/res/cardsfolder/b/bear_umbra.txt
@@ -4,8 +4,9 @@ Types:Enchantment Aura
 K:Enchant creature
 K:Totem armor
 A:SP$ Attach | Cost$ 2 G G | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ TrigUntap | AddSVar$ BearUmbraUntap | Description$ Enchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control."
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ TrigUntap | AddSVar$ BearUmbraUntap & HasAttackEffect | Description$ Enchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control."
 SVar:TrigUntap:Mode$ Attacks | ValidCard$ Card.Self | Execute$ BearUmbraUntap | TriggerDescription$ Whenever this creature attacks, untap all lands you control.
-SVar:BearUmbraUntap:AB$UntapAll | Cost$ 0 | ValidCards$ Land.YouCtrl
+SVar:BearUmbraUntap:AB$ UntapAll | Cost$ 0 | ValidCards$ Land.YouCtrl
+SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bear_umbra.jpg
 Oracle:Enchant creature\nEnchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control."\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/claim_of_erebos.txt b/forge-gui/res/cardsfolder/c/claim_of_erebos.txt
index 47f071b4dfc..d744a6c38a2 100644
--- a/forge-gui/res/cardsfolder/c/claim_of_erebos.txt
+++ b/forge-gui/res/cardsfolder/c/claim_of_erebos.txt
@@ -5,4 +5,5 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ ABLoseLife | Description$ Enchanted creature has "{1}{B}, {T}: Target player loses 2 life."
 SVar:ABLoseLife:AB$ LoseLife | Cost$ 1 B T | ValidTgts$ Player | LifeAmount$ 2 | SpellDescription$ Target player loses 2 life.
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/claim_of_erebos.jpg
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/epiphany_storm.txt b/forge-gui/res/cardsfolder/e/epiphany_storm.txt
index 53de5dff3a2..497910f1cdf 100644
--- a/forge-gui/res/cardsfolder/e/epiphany_storm.txt
+++ b/forge-gui/res/cardsfolder/e/epiphany_storm.txt
@@ -5,4 +5,5 @@ K:Enchant creature
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ UCDraw | Description$ Enchanted creature has "R, {T}, Discard a card: Draw a card."
 SVar:UCDraw:AB$ Draw | Cost$ R T Discard<1/Card> | NumCards$ 1 | SpellDescription$ Draw a card.
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/epiphany_storm.jpg
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/heroes_podium.txt b/forge-gui/res/cardsfolder/h/heroes_podium.txt
index 3b9f1784bc5..338ac0f843d 100644
--- a/forge-gui/res/cardsfolder/h/heroes_podium.txt
+++ b/forge-gui/res/cardsfolder/h/heroes_podium.txt
@@ -5,6 +5,5 @@ S:Mode$ Continuous | Affected$ Creature.Legendary | AddPower$ AffectedX | AddTou
 SVar:AffectedX:Count$Valid Creature.Legendary+Other
 A:AB$ Dig | Cost$ X T | DigNum$ X | ChangeNum$ 1 | ChangeValid$ Creature.Legendary | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | References$ X | SpellDescription$ Look at the top X cards of your library. You may reveal a legendary creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 SVar:X:Count$xPaid
-SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heroes_podium.jpg
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/siren_song_lyre.txt b/forge-gui/res/cardsfolder/s/siren_song_lyre.txt
index 760cd8c4ef7..f472e63093a 100644
--- a/forge-gui/res/cardsfolder/s/siren_song_lyre.txt
+++ b/forge-gui/res/cardsfolder/s/siren_song_lyre.txt
@@ -4,4 +4,5 @@ Types:Artifact Equipment
 K:Equip 2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddAbility$ SirenSongTap | Description$ Equipped creature has "2, {T}: Tap target creature."
 SVar:SirenSongTap:AB$ Tap | Cost$ 2 T | ValidTgts$ Creature | SpellDescription$ Tap target creature.
+SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/siren_song_lyre.jpg
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/spiteful_returned.txt b/forge-gui/res/cardsfolder/s/spiteful_returned.txt
index 4c7dae6efc5..df4938a0fd2 100644
--- a/forge-gui/res/cardsfolder/s/spiteful_returned.txt
+++ b/forge-gui/res/cardsfolder/s/spiteful_returned.txt
@@ -5,5 +5,6 @@ PT:1/1
 K:Bestow:3 B
 T:Mode$ Attacks | ValidCard$ Card.Self,Creature.EnchantedBy | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or enchanted creature attacks, defending player loses 2 life.
 SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredDefendingPlayer | LifeAmount$ 2
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddSVar$ HasAttackEffect | Description$ Enchanted creature gets +1/+1.
+SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spiteful_returned.jpg
\ No newline at end of file