diff --git a/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java b/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java
index 1e6fceecbd0..fdb8142e709 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/DeadshotMinotaur.java
@@ -66,7 +66,7 @@ public class DeadshotMinotaur extends CardImpl {
 
         // When Deadshot Minotaur enters the battlefield, it deals 3 damage to target creature with flying.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), false);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         // Cycling {RG}
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{R/G}")));
diff --git a/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java b/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java
index fa0891aa0e3..f806bb2630f 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/QasaliPridemage.java
@@ -76,7 +76,7 @@ public class QasaliPridemage extends CardImpl {
         // {1}, Sacrifice Qasali Pridemage: Destroy target artifact or enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}"));
         ability.addCost(new SacrificeSourceCost());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java b/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java
index 38d20cdfc98..902dfcdc3ad 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/UnbenderTine.java
@@ -65,7 +65,7 @@ public class UnbenderTine extends CardImpl {
 
         // {tap}: Untap another target permanent.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnbenderTineEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java b/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java
index babf34ba4dc..e033ef8b258 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/VithianRenegades.java
@@ -61,7 +61,7 @@ public class VithianRenegades extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/alliances/Exile.java b/Mage.Sets/src/mage/sets/alliances/Exile.java
index 521c2579b83..93dce5cac61 100644
--- a/Mage.Sets/src/mage/sets/alliances/Exile.java
+++ b/Mage.Sets/src/mage/sets/alliances/Exile.java
@@ -66,7 +66,7 @@ public class Exile extends CardImpl {
         this.color.setWhite(true);
 
         // Exile target nonwhite attacking creature. 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new ExileTargetEffect());
         // You gain life equal to its toughness.
         this.getSpellAbility().addEffect(new ExileEffect());
diff --git a/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java b/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java
index c4b065b5c3c..e04152e11e7 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/DeathMutation.java
@@ -62,7 +62,7 @@ public class DeathMutation extends CardImpl {
 
         // Destroy target nonblack creature. It can't be regenerated.
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         // Put X 1/1 green Saproling creature tokens onto the battlefield, where X is that creature's converted mana cost.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new SaprolingToken(), new TargetConvertedManaCost()));
     }
diff --git a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java
index dc645b8a787..6ae6c8cb20a 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/OrimsThunder.java
@@ -74,7 +74,7 @@ public class OrimsThunder extends CardImpl {
 
         // Destroy target artifact or enchantment. If Orim's Thunder was kicked, it deals damage equal to that permanent's converted mana cost to target creature.
         this.getSpellAbility().addEffect(new OrimsThunderEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
                 new OrimsThunderEffect2(),
                 KickedCondition.getInstance(),
diff --git a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java
index fbe4609e618..87dbbaf4230 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/QuagmireDruid.java
@@ -73,7 +73,7 @@ public class QuagmireDruid extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(false), new ColoredManaCost(ColoredManaSymbol.G));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java b/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java
index e7cde8bb508..3d858509a8e 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/KingSuleiman.java
@@ -67,7 +67,7 @@ public class KingSuleiman extends CardImpl {
 
         // {tap}: Destroy target Djinn or Efreet.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java b/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java
index 82bba6e34d3..217bd5350fe 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/BanishingStroke.java
@@ -63,7 +63,7 @@ public class BanishingStroke extends CardImpl {
 
         // Put target artifact, creature, or enchantment on the bottom of its owner's library.
         this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(false));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
 
         // Miracle {W}
         this.addAbility(new MiracleAbility(new ManaCostsImpl("{W}")));
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java b/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java
index fa8d3bbb023..a60ee8f6f69 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/Cursebreak.java
@@ -56,7 +56,7 @@ public class Cursebreak extends CardImpl {
         this.color.setWhite(true);
 
         // Destroy target enchantment. You gain 2 life.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new GainLifeEffect(2));
     }
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java
index a1a951f8103..06e01f24194 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/DevoutChaplain.java
@@ -81,7 +81,7 @@ public class DevoutChaplain extends CardImpl {
         // {tap}, Tap two untapped Humans you control: Exile target artifact or enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new TapSourceCost());
         ability.addCost(new TapTargetCost(new TargetControlledPermanent(2, 2, humanFilter, false)));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java b/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java
index 659c527ca89..95462f0affc 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/EatenBySpiders.java
@@ -62,7 +62,7 @@ public class EatenBySpiders extends CardImpl {
 
         // Destroy target creature with flying and all Equipment attached to that creature.
         this.getSpellAbility().addEffect(new EatenBySpidersEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public EatenBySpiders(final EatenBySpiders card) {
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java b/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java
index 0f78f7644e3..8dd1e8e5e06 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/HumanFrailty.java
@@ -55,7 +55,7 @@ public class HumanFrailty extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target Human creature.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java b/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java
index 17dd347ad02..7c76f32f355 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/NaturalEnd.java
@@ -61,7 +61,7 @@ public class NaturalEnd extends CardImpl {
         // Destroy target artifact or enchantment. You gain 3 life.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new GainLifeEffect(3));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public NaturalEnd(final NaturalEnd card) {
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java
index 952e56a09a1..855782633d5 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/PeelFromReality.java
@@ -64,7 +64,7 @@ public class PeelFromReality extends CardImpl {
         // Return target creature you control and target creature you don't control to their owners' hands.
         this.getSpellAbility().addEffect(new PeelFromRealityEffect());
         this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public PeelFromReality(final PeelFromReality card) {
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java
index 1bfb1bbe869..7492fd0446f 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/Thunderbolt.java
@@ -62,7 +62,7 @@ public class Thunderbolt extends CardImpl {
         this.getSpellAbility().addTarget(new TargetPlayer(true));
         Mode mode = new Mode();
         mode.getEffects().add(new DamageTargetEffect(4));
-        mode.getTargets().add(new TargetCreaturePermanent(filter));
+        mode.getTargets().add(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addMode(mode);
     }
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java
index f01659db324..ac8c6a35a92 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Eradicate.java
@@ -57,7 +57,7 @@ public class Eradicate extends CardImpl {
 
         // Exile target nonblack creature. Search its controller's graveyard, hand, and library for all cards 
         // with the same name as that creature and exile them. Then that player shuffles his or her library.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that creature"));
     }
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java
index 63d3492bb1c..b9c4552e6a9 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/HerosDemise.java
@@ -54,7 +54,7 @@ public class HerosDemise extends CardImpl {
         this.color.setBlack(true);
         // Destroy target legendary creature.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public HerosDemise(final HerosDemise card) {
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java
index 149e08b5c36..f3b1ce4df6f 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/IsaoEnlightenedBushi.java
@@ -71,7 +71,7 @@ public class IsaoEnlightenedBushi extends CardImpl {
         this.addAbility(new BushidoAbility(2));
         // {2}: Regenerate target Samurai.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java
index 84b200cc7fe..aa01c99f8dd 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamoSightbender.java
@@ -73,7 +73,7 @@ public class MinamoSightbender extends CardImpl {
 
         // {X}, {T}: Target creature with power X or less is unblockable this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new ManaCostsImpl("{X}"));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         ability.addCost(new TapSourceCost());
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java
index 8a0a1c85425..2effb5f75f5 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java
@@ -102,7 +102,7 @@ class MistbladeShinobiTriggeredAbility extends TriggeredAbilityImpl {
                 FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getName() + " controls");
                 filter.add(new ControllerIdPredicate(opponent.getId()));
                 this.getTargets().clear();
-                this.addTarget(new TargetCreaturePermanent(filter));
+                this.addTarget(new TargetCreaturePermanent(filter, true));
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java
index b49c3e92acb..54d10884f30 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/NezumiShadowWatcher.java
@@ -64,7 +64,7 @@ public class NezumiShadowWatcher extends CardImpl {
         this.toughness = new MageInt(1);
         // Sacrifice Nezumi Shadow-Watcher: Destroy target Ninja.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java
index aef4d1e0f30..0b9edce6fe2 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PusKami.java
@@ -69,7 +69,7 @@ public class PusKami extends CardImpl {
         // {B}, Sacrifice Pus Kami: Destroy target nonblack creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.B));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         this.addAbility(new SoulshiftAbility(6));
     }
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java
index 54f22d069da..7226fc45653 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Scour.java
@@ -55,7 +55,7 @@ public class Scour extends CardImpl {
 
         // Exile target enchantment.
         // Search its controller's graveyard, hand, and library for all cards with the same name as that enchantment and exile them. Then that player shuffles his or her library.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter)); 
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true)); 
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that enchantment"));
     }
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java
index 4319e42cfa2..bac84f261b1 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/SowingSalt.java
@@ -56,7 +56,7 @@ public class SowingSalt extends CardImpl {
 
         // Exile target nonbasic land. Search its controller's graveyard, hand, and library for all cards with 
         // the same name as that land and exile them. Then that player shuffles his or her library.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that land"));
     }
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java
index 8487a48415d..ba09dd04afd 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Splinter.java
@@ -51,7 +51,7 @@ public class Splinter extends CardImpl {
 
         // Exile target artifact. Search its controller's graveyard, hand, and library for all cards
         // with the same name as that artifact and exile them. Then that player shuffles his or her library.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that artifact"));
     }
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java
index b512534441b..c731329d8c1 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/TerashisGrasp.java
@@ -65,7 +65,7 @@ public class TerashisGrasp extends CardImpl {
         this.color.setWhite(true);
 
         // Destroy target artifact or enchantment. 
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         // You gain life equal to its converted mana cost.
         this.getSpellAbility().addEffect(new TerashisGraspEffect());
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java
index 0bde0394ef9..64c052ae67e 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThatWhichWasTaken.java
@@ -72,7 +72,7 @@ public class ThatWhichWasTaken extends CardImpl {
         // {4}, {T}: Put a divinity counter on target permanent other than That Which Was Taken.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.DIVINITY.createInstance()), new GenericManaCost(4));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
 
         // Each permanent with a divinity counter on it is indestructible.
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java
index a8375ce40ae..de2d930a0f5 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThreadsOfDisloyalty.java
@@ -64,7 +64,7 @@ public class ThreadsOfDisloyalty extends CardImpl {
         this.subtype.add("Aura");
 
         // Enchant creature with converted mana cost 2 or less
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java
index f19f9d5e95e..a17ca648c8c 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java
@@ -105,7 +105,7 @@ class ThroatSlitterTriggeredAbility extends TriggeredAbilityImpl {
             filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK)));
             filter.setMessage("nonblack creature controlled by " + game.getPlayer(event.getTargetId()).getName());
             this.getTargets().clear();
-            this.addTarget(new TargetPermanent(filter));
+            this.addTarget(new TargetPermanent(filter, true));
             return true;
         }
         return false;
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java b/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java
index a999efd8ecc..322d3e7f034 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/AkroanConscriptor.java
@@ -74,7 +74,7 @@ public class AkroanConscriptor extends CardImpl {
         effect = new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn);
         effect.setText("It gains haste until end of turn");
         ability.addEffect(effect);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
 
     }
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java b/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java
index 1edf83ab403..c526e9d7871 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/NessianDemolok.java
@@ -68,7 +68,7 @@ public class NessianDemolok extends CardImpl {
         this.addAbility(new TributeAbility(3));
         // When Nessian Demolok enters the battlefield, if tribute wasn't paid, destroy target noncreature permanent.
         TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(new ConditionalTriggeredAbility(ability, TributeNotPaidCondition.getInstance(),
                 "When {this} enters the battlefield, if its tribute wasn't paid, destroy target noncreature permanent."));
     }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java
index cb2366c77e7..7b238cee7a9 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/Befoul.java
@@ -63,7 +63,7 @@ public class Befoul extends CardImpl {
         this.color.setBlack(true);
         // Destroy target land or nonblack creature. It can't be regenerated.
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Befoul (final Befoul card) {
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java
index c18e2242b7b..cc61b4130e7 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/BlindWithAnger.java
@@ -63,7 +63,7 @@ public class BlindWithAnger extends CardImpl {
         this.getSpellAbility().addEffect(new UntapTargetEffect());
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(target);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java
index 3fba0664ee4..63221839a41 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/CrushingPain.java
@@ -58,7 +58,7 @@ public class CrushingPain extends CardImpl {
 
         // Crushing Pain deals 6 damage to target creature that was dealt damage this turn.
         this.getSpellAbility().addEffect(new DamageTargetEffect(6));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public CrushingPain (final CrushingPain card) {
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java
index ae10642a37c..93677a858cd 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/EiganjoCastle.java
@@ -60,7 +60,7 @@ public class EiganjoCastle extends CardImpl {
         this.addAbility(new WhiteManaAbility());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new ColoredManaCost(ColoredManaSymbol.W));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java
index 82fb734aa05..bb929bdf0b0 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HearthKami.java
@@ -73,7 +73,7 @@ public class HearthKami extends CardImpl {
             ability.getTargets().clear();
             FilterArtifactPermanent filter = new FilterArtifactPermanent(new StringBuilder("artifact with converted mana cost ").append(xValue).toString());
             filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.Equal, xValue));
-            Target target = new TargetPermanent(filter);
+            Target target = new TargetPermanent(filter, true);
             target.setRequired(true);
             ability.addTarget(target);
         }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java
index 18effc5a9d4..26cdab93fe2 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/InitiateOfBlood.java
@@ -71,7 +71,7 @@ public class InitiateOfBlood extends CardImpl {
 
         // {T}: Initiate of Blood deals 1 damage to target creature that was dealt damage this turn. 
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
 
         // When that creature is put into a graveyard this turn, flip Initiate of Blood.
@@ -109,7 +109,7 @@ class GokaTheUnjust extends Token {
 
         // {T}: Goka the Unjust deals 4 damage to target creature that was dealt damage this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java
index d05e8f994f4..8efe4e6718b 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KamiOfAncientLaw.java
@@ -62,7 +62,7 @@ public class KamiOfAncientLaw extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java
index f7a78ca3428..cc0e5ee2ed8 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneDiviner.java
@@ -64,7 +64,7 @@ public class KitsuneDiviner extends CardImpl {
         this.power = new MageInt(0);
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java
index b9210ba0098..4e6b98cb06a 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneHealer.java
@@ -74,7 +74,7 @@ public class KitsuneHealer extends CardImpl {
         this.addAbility(firstAbility);
         // {T}: Prevent all damage that would be dealt to target legendary creature this turn.
         Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE), new TapSourceCost());
-        secondAbility.addTarget(new TargetCreaturePermanent(filter));
+        secondAbility.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(secondAbility);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java
index 98422b1343b..0a33fb35929 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KitsuneMystic.java
@@ -112,7 +112,7 @@ class AutumnTailKitsuneSage extends Token {
 
         // {1}: Attach target Aura attached to a creature to another creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AutumnTailEffect(), new GenericManaCost(1));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         ability.addTarget(new TargetCreaturePermanent(true));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java
index c498b871108..0425251bc67 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/MinamoSchoolAtWatersEdge.java
@@ -65,7 +65,7 @@ public class MinamoSchoolAtWatersEdge extends CardImpl {
         this.addAbility(new BlueManaAbility());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(),  new ColoredManaCost(ColoredManaSymbol.U));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java
index febe46428c8..c439b0ef597 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NineRingedBo.java
@@ -67,7 +67,7 @@ public class NineRingedBo extends CardImpl {
 
         // {T}: Nine-Ringed Bo deals 1 damage to target Spirit creature. If that creature would die this turn, exile it instead.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addEffect(new NineRingedBoEffect());
         this.addAbility(ability);
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java
index c86f136e99f..c6a14660de0 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/OkinaTempleToTheGrandfathers.java
@@ -60,7 +60,7 @@ public class OkinaTempleToTheGrandfathers extends CardImpl {
         this.addAbility(new GreenManaAbility());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.G));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java
index 3c4e48a4f30..fd183ecf142 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/QuietPurity.java
@@ -54,7 +54,7 @@ public class QuietPurity extends CardImpl {
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
         this.color.setWhite(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java
index b9abf9240c3..46da2d1ecec 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendFlesh.java
@@ -56,7 +56,7 @@ public class RendFlesh extends CardImpl {
         this.expansionSetCode = "CHK";
         this.subtype.add("Arcane");
         this.color.setBlack(true);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(target);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java
index b85cdce4269..9be1631dbc1 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RendSpirit.java
@@ -53,7 +53,7 @@ public class RendSpirit extends CardImpl {
         super(ownerId, 141, "Rend Spirit", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}");
         this.expansionSetCode = "CHK";
         this.color.setBlack(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java
index 3d046b24a49..6615d59b95e 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShinkaTheBloodsoakedKeep.java
@@ -61,7 +61,7 @@ public class ShinkaTheBloodsoakedKeep extends CardImpl {
         this.addAbility(new RedManaAbility());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.R));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java
index 1cbcd4fa97a..a86cbb6b84e 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ShizoDeathsStorehouse.java
@@ -61,7 +61,7 @@ public class ShizoDeathsStorehouse extends CardImpl {
         this.addAbility(new BlackManaAbility());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java b/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java
index 0c9160298f4..b719e2e1da1 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/WearAway.java
@@ -59,7 +59,7 @@ public class WearAway extends CardImpl {
 
         // Destroy target artifact or enchantment.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
         // Splice onto Arcane {3}{G}
diff --git a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java
index ac9f547e443..01696a2a517 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java
@@ -79,7 +79,7 @@ public class AdarkarValkyrie extends CardImpl {
         this.addAbility(VigilanceAbility.getInstance());
         // {tap}: When target creature other than Adarkar Valkyrie dies this turn, return that card to the battlefield under your control.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AdarkarValkyrieEffect(), new TapSourceCost());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         ability.addTarget(target);
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/commander/Shriekmaw.java b/Mage.Sets/src/mage/sets/commander/Shriekmaw.java
index d8b63b017b0..94c627ba219 100644
--- a/Mage.Sets/src/mage/sets/commander/Shriekmaw.java
+++ b/Mage.Sets/src/mage/sets/commander/Shriekmaw.java
@@ -72,7 +72,7 @@ public class Shriekmaw extends CardImpl {
 
         // When Shriekmaw enters the battlefield, destroy target nonartifact, nonblack creature.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(),false);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java b/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java
index e834bb04a36..09db9863fb7 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DeepfireElemental.java
@@ -69,7 +69,7 @@ public class DeepfireElemental extends CardImpl {
 
         // {X}{X}{1}: Destroy target artifact or creature with converted mana cost X.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{X}{X}{1}"));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java
index a919c2b1825..f9827886282 100644
--- a/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java
+++ b/Mage.Sets/src/mage/sets/conflux/BeaconBehemoth.java
@@ -66,7 +66,7 @@ public class BeaconBehemoth extends CardImpl {
         this.toughness = new MageInt(3);
 
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(VigilanceAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java
index 039bafee37e..5da8b7fcb38 100644
--- a/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java
+++ b/Mage.Sets/src/mage/sets/conflux/CelestialPurge.java
@@ -57,7 +57,7 @@ public class CelestialPurge extends CardImpl {
         super(ownerId, 5, "Celestial Purge", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}");
         this.expansionSetCode = "CON";
         this.color.setWhite(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new ExileTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java b/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java
index 1c48a2fddc0..7e1f8cdb4eb 100644
--- a/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java
+++ b/Mage.Sets/src/mage/sets/conflux/ControlledInstincts.java
@@ -66,7 +66,7 @@ public class ControlledInstincts extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant red or green creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
diff --git a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java
index 1f490d4c0e2..0f334a8470b 100644
--- a/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java
+++ b/Mage.Sets/src/mage/sets/conflux/EtherswornAdjudicator.java
@@ -75,7 +75,7 @@ public class EtherswornAdjudicator extends CardImpl {
         // {1}{W}{B}, {T}: Destroy target creature or enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}{B}"));
         ability.addCost(new TapSourceCost());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java b/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java
index a7dd009fb14..ccc58ba6f95 100644
--- a/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java
+++ b/Mage.Sets/src/mage/sets/conflux/FiligreeFracture.java
@@ -65,7 +65,7 @@ public class FiligreeFracture extends CardImpl {
         this.color.setGreen(true);
 
         // Destroy target artifact or enchantment. If that permanent was blue or black, draw a card.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new FiligreeFractureEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java b/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java
index f4103b13202..da83ebf9550 100644
--- a/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java
+++ b/Mage.Sets/src/mage/sets/conflux/GwafaHazidProfiteer.java
@@ -78,7 +78,7 @@ public class GwafaHazidProfiteer extends CardImpl {
         // {W}{U}, {tap}: Put a bribery counter on target creature you don't control. Its controller draws a card.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GwafaHazidProfiteerEffect1(), new ManaCostsImpl("{W}{U}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         
         // Creatures with bribery counters on them can't attack or block.
diff --git a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java
index 064eab53e37..0c92093f238 100644
--- a/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java
+++ b/Mage.Sets/src/mage/sets/conflux/MoltenFrame.java
@@ -56,7 +56,7 @@ public class MoltenFrame extends CardImpl {
         this.expansionSetCode = "CON";
         this.color.setRed(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
     }
 
diff --git a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java
index 29d4077da68..05fe5e69302 100644
--- a/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java
+++ b/Mage.Sets/src/mage/sets/conflux/NicolBolasPlaneswalker.java
@@ -73,7 +73,7 @@ public class NicolBolasPlaneswalker extends CardImpl {
 
         // +3: Destroy target noncreature permanent.
         LoyaltyAbility ability = new LoyaltyAbility(new DestroyTargetEffect(), 3);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
         // -2: Gain control of target creature.
         ability = new LoyaltyAbility(new GainControlTargetEffect(Duration.Custom), -2);
diff --git a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java
index 87b33b016b9..c736362afc4 100644
--- a/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java
+++ b/Mage.Sets/src/mage/sets/conflux/VagrantPlowbeasts.java
@@ -66,7 +66,7 @@ public class VagrantPlowbeasts extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new RegenerateTargetEffect(),
                 new ManaCostsImpl("{1}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java b/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java
index 76b25122138..41b023b632d 100644
--- a/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java
+++ b/Mage.Sets/src/mage/sets/darkascension/AlphaBrawl.java
@@ -63,7 +63,7 @@ public class AlphaBrawl extends CardImpl {
 
         // Target creature an opponent controls deals damage equal to its power to each other creature that player controls, then each of those creatures deals damage equal to its power to that creature.
         this.getSpellAbility().addEffect(new AlphaBrawlEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
 
     }
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java b/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java
index d071fd982f6..23dc90c6e03 100644
--- a/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java
+++ b/Mage.Sets/src/mage/sets/darkascension/CrushingVines.java
@@ -58,7 +58,7 @@ public class CrushingVines extends CardImpl {
         this.color.setGreen(true);
 
         // Choose one - Destroy target creature with flying; or destroy target artifact.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         Mode mode = new Mode();
         mode.getTargets().add(new TargetArtifactPermanent());
diff --git a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java
index a384d027dca..b5a4c1af5e8 100644
--- a/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java
+++ b/Mage.Sets/src/mage/sets/darkascension/DungeonGeists.java
@@ -76,7 +76,7 @@ public class DungeonGeists extends CardImpl {
         // When Dungeon Geists enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's untap step for as long as you control Dungeon Geists.
         Ability ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), false);
         ability.addEffect(new DungeonGeistsEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java b/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java
index 68297e1846c..4eb102ade87 100644
--- a/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java
+++ b/Mage.Sets/src/mage/sets/darkascension/FeedThePack.java
@@ -96,7 +96,7 @@ class FeedThePackEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         Player player = game.getPlayer(source.getControllerId());
         if (player.choose(Outcome.PutCreatureInPlay, target, source.getSourceId(), game)) {
             Permanent permanent = game.getPermanent(target.getFirstTarget());
diff --git a/Mage.Sets/src/mage/sets/darkascension/Helvault.java b/Mage.Sets/src/mage/sets/darkascension/Helvault.java
index 452e9ab00b0..256bff29266 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Helvault.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Helvault.java
@@ -69,7 +69,7 @@ public class Helvault extends CardImpl {
         // {7}, {tap}: Exile target creature you don't control.
         ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Helvault exile"), new GenericManaCost(7));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         // When Helvault is put into a graveyard from the battlefield, return all cards exiled with it to the battlefield under their owners' control.
         this.addAbility(new DiesTriggeredAbility(new ReturnFromExileForSourceEffect(Zone.BATTLEFIELD)));
diff --git a/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java b/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java
index 28de9740c40..8509ddeb83c 100644
--- a/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java
+++ b/Mage.Sets/src/mage/sets/darkascension/RayOfRevelation.java
@@ -58,7 +58,7 @@ public class RayOfRevelation extends CardImpl {
         this.color.setWhite(true);
 
         // Destroy target enchantment.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         // Flashback {G}
         this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT));
diff --git a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java
index 0bcdaa4c04f..5b637bb26fc 100644
--- a/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java
+++ b/Mage.Sets/src/mage/sets/darkascension/SavingGrasp.java
@@ -60,7 +60,7 @@ public class SavingGrasp extends CardImpl {
         this.color.setBlue(true);
 
         // Return target creature you own to your hand.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
         // Flashback {W}
         this.addAbility(new FlashbackAbility(new ManaCostsImpl("{W}"), TimingRule.INSTANT));
diff --git a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java
index 042ff239834..3e0a78c2854 100644
--- a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java
+++ b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java
@@ -110,7 +110,7 @@ class SoulSeizerTriggeredAbility extends TriggeredAbilityImpl {
                     filter.add(new ControllerIdPredicate(opponent.getId()));
 
                     this.getTargets().clear();
-                    this.addTarget(new TargetCreaturePermanent(filter));
+                    this.addTarget(new TargetCreaturePermanent(filter, true));
                     return true;
                 }
             }
diff --git a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java
index 8e42aaa0d39..338c5a3cf8d 100644
--- a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java
+++ b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java
@@ -99,7 +99,7 @@ class WerewolfRansackerAbility extends TriggeredAbilityImpl {
 
     public WerewolfRansackerAbility() {
         super(Zone.BATTLEFIELD, new WerewolfRansackerEffect(), true);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         this.addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java
index 4d8d99d6f1a..0335ea3eac7 100644
--- a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java
+++ b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java
@@ -68,7 +68,7 @@ public class WolfhuntersQuiver extends CardImpl {
         WolfhuntersQuiverAbility ability = new WolfhuntersQuiverAbility(1, new TargetCreatureOrPlayer());
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT)));
         // and "{tap}: This creature deals 3 damage to target Werewolf creature."
-        ability = new WolfhuntersQuiverAbility(3, new TargetCreaturePermanent(filter));
+        ability = new WolfhuntersQuiverAbility(3, new TargetCreaturePermanent(filter, true));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ability, AttachmentType.EQUIPMENT)));
         // Equip {5}
         this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(5)));
diff --git a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java
index 755c4546519..ce1c22753c5 100644
--- a/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java
+++ b/Mage.Sets/src/mage/sets/darksteel/BlinkmothNexus.java
@@ -67,7 +67,7 @@ public class BlinkmothNexus extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new BlinkmothNexusToken(), "land", Duration.EndOfTurn), new GenericManaCost(1)));
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
 
     }
diff --git a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java
index 98b74c3f3df..a33df70c444 100644
--- a/Mage.Sets/src/mage/sets/darksteel/Coretapper.java
+++ b/Mage.Sets/src/mage/sets/darksteel/Coretapper.java
@@ -63,10 +63,10 @@ public class Coretapper extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
         Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance()), new TapSourceCost());
-        firstAbility.addTarget(new TargetPermanent(filter));
+        firstAbility.addTarget(new TargetPermanent(filter, true));
         this.addAbility(firstAbility);
         Ability secondAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.CHARGE.createInstance(2)), new SacrificeSourceCost());
-        secondAbility.addTarget(new TargetPermanent(filter));
+        secondAbility.addTarget(new TargetPermanent(filter, true));
         this.addAbility(secondAbility);
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java
index c39e2977f57..90dac8fd94a 100644
--- a/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java
+++ b/Mage.Sets/src/mage/sets/darksteel/EchoingCalm.java
@@ -57,7 +57,7 @@ public class EchoingCalm extends CardImpl {
 
         this.color.setWhite(true);
 
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new EchoingCalmEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java
index b42c5842709..b2e98c7cddf 100644
--- a/Mage.Sets/src/mage/sets/darksteel/Oxidize.java
+++ b/Mage.Sets/src/mage/sets/darksteel/Oxidize.java
@@ -54,7 +54,7 @@ public class Oxidize extends CardImpl {
         this.expansionSetCode = "DST";
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Oxidize(final Oxidize card) {
diff --git a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java
index 4e237278601..0417998ef25 100644
--- a/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java
+++ b/Mage.Sets/src/mage/sets/darksteel/PteronGhost.java
@@ -64,7 +64,7 @@ public class PteronGhost extends CardImpl {
         this.toughness = new MageInt(1);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java
index 3d61499468b..dd552d7639b 100644
--- a/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java
+++ b/Mage.Sets/src/mage/sets/darksteel/SlobadGoblinTinkerer.java
@@ -76,7 +76,7 @@ public class SlobadGoblinTinkerer extends CardImpl {
         effect.setText("Target artifact is indestructible this turn");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 effect, new SacrificeTargetCost(new TargetControlledPermanent(filterControlled)));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java
index 731850a4c8d..0eb1c236d62 100644
--- a/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java
+++ b/Mage.Sets/src/mage/sets/darksteel/ViridianZealot.java
@@ -68,7 +68,7 @@ public class ViridianZealot extends CardImpl {
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}"));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java b/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java
index 58d35b45d45..50430ece062 100644
--- a/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java
+++ b/Mage.Sets/src/mage/sets/darksteel/VoltaicConstruct.java
@@ -62,7 +62,7 @@ public class VoltaicConstruct extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(2));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java
index 0b3b806fab6..dfc8ea4ff48 100644
--- a/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java
+++ b/Mage.Sets/src/mage/sets/dissension/HaazdaExonerator.java
@@ -65,7 +65,7 @@ public class HaazdaExonerator extends CardImpl {
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java
index 43e963a19b8..aaf0714de1b 100644
--- a/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java
+++ b/Mage.Sets/src/mage/sets/dissension/IndrikStomphowler.java
@@ -62,7 +62,7 @@ public class IndrikStomphowler extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java b/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java
index 33511ad39dd..919f1832738 100644
--- a/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java
+++ b/Mage.Sets/src/mage/sets/dissension/PsychoticFury.java
@@ -60,7 +60,7 @@ public class PsychoticFury extends CardImpl {
         this.color.setRed(true);
 
         // Target multicolored creature gains double strike until end of turn.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn));
         // Draw a card.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
diff --git a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java
index ccc025dfe80..1f043abe593 100644
--- a/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java
+++ b/Mage.Sets/src/mage/sets/dissension/SealOfDoom.java
@@ -59,7 +59,7 @@ public class SealOfDoom extends CardImpl {
         this.expansionSetCode = "DIS";
         this.color.setBlack(true);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new SacrificeSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java
index b7d82fa50fe..eb4261dbcee 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ClearAPath.java
@@ -59,7 +59,7 @@ public class ClearAPath extends CardImpl {
 
         // Destroy target creature with defender.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java b/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java
index c05e1d47ca7..8d0912a89b4 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/DeputyOfAcquittals.java
@@ -70,7 +70,7 @@ public class DeputyOfAcquittals extends CardImpl {
         this.addAbility(FlashAbility.getInstance());
         // When Deputy of Acquittals enters the battlefield, you may return another target creature you control to its owner's hand.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java
index 5dc2cede592..23bcd4340af 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/HaazdaSnareSquad.java
@@ -70,7 +70,7 @@ public class HaazdaSnareSquad extends CardImpl {
         // Whenever Haazda Snare Squad attacks you may pay {W}. If you do, tap target creature an opponent controls.
         Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(new TapTargetEffect(""), new ManaCostsImpl("{W}")),false,
                 "Whenever {this} attacks you may pay {W}. If you do, tap target creature an opponent controls.");
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java
index c175c911b5b..62e676a7acc 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/RunnersBane.java
@@ -68,7 +68,7 @@ public class RunnersBane extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant creature with power 3 or less
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.UnboostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java b/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java
index 6ab662db80d..2e29ca2874e 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ScabClanGiant.java
@@ -69,7 +69,7 @@ public class ScabClanGiant extends CardImpl {
 
         // When Scab-Clan Giant enters the battlefield, it fights target creature an opponent controls chosen at random.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ScabClanGiantEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRandom(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java b/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java
index 3397099d889..a1af198f327 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/VorelOfTheHullClade.java
@@ -76,7 +76,7 @@ public class VorelOfTheHullClade extends CardImpl {
 
         // {G}{U}, {tap}: For each counter on target artifact, creature, or land, put another of those counters on that permanent.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VorelOfTheHullCladeEffect(), new ManaCostsImpl("{G}{U}"));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
         
diff --git a/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java b/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java
index 5b430899282..d37859087c2 100644
--- a/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java
+++ b/Mage.Sets/src/mage/sets/eighthedition/DwarvenDemolitionTeam.java
@@ -65,7 +65,7 @@ public class DwarvenDemolitionTeam extends CardImpl {
 
         // {tap}: Destroy target Wall.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java
index c77967c98a8..de0575c157a 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/DaruEncampment.java
@@ -64,7 +64,7 @@ public class DaruEncampment extends CardImpl {
                 new BoostTargetEffect(1, 1, Duration.EndOfTurn),
                 new ManaCostsImpl("{W}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java
index 92730b8dc2a..e8b75833a14 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/EnergyChamber.java
@@ -66,7 +66,7 @@ public class EnergyChamber extends CardImpl {
 
         // At the beginning of your upkeep, choose one - Put a +1/+1 counter on target artifact creature;
         Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(), Outcome.BoostCreature), TargetController.YOU, false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
 
         // or put a charge counter on target noncreature artifact.
         Mode mode = new Mode();
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java
index 783fecbc23c..d1fec56323b 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/MishrasFactory.java
@@ -70,7 +70,7 @@ public class MishrasFactory extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new BoostTargetEffect(1, 1, Duration.EndOfTurn),
                 new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java b/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java
index afbbc30ebc4..9baae05a7b7 100644
--- a/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java
+++ b/Mage.Sets/src/mage/sets/eventide/AerieOuphes.java
@@ -67,7 +67,7 @@ public class AerieOuphes extends CardImpl {
 
         // Sacrifice Aerie Ouphes: Aerie Ouphes deals damage equal to its power to target creature with flying.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(new SourcePermanentPowerCount()), new SacrificeSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
 
         // Persist
diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
index 762df8397a3..f136b074db5 100644
--- a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
+++ b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
@@ -100,7 +100,7 @@ class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl {
                     filter.add(new ControllerIdPredicate(opponent.getId()));
 
                     this.getTargets().clear();
-                    this.addTarget(new TargetCreaturePermanent(filter));
+                    this.addTarget(new TargetCreaturePermanent(filter, true));
                     return true;
                 }
             }
diff --git a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java
index 3955aec7340..bac5afb2340 100644
--- a/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java
+++ b/Mage.Sets/src/mage/sets/eventide/BanishingKnack.java
@@ -57,7 +57,7 @@ public class BanishingKnack extends CardImpl {
         this.expansionSetCode = "EVE";
         this.color.setBlue(true);
         Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost());
-        gainedAbility.addTarget(new TargetPermanent(filter));
+        gainedAbility.addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(gainedAbility, Duration.EndOfTurn));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
     }
diff --git a/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java b/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java
index bbee045b857..6c72ed18bc4 100644
--- a/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java
+++ b/Mage.Sets/src/mage/sets/eventide/CrumblingAshes.java
@@ -62,7 +62,7 @@ public class CrumblingAshes extends CardImpl {
 
         // At the beginning of your upkeep, destroy target creature with a -1/-1 counter on it.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), TargetController.YOU, false);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java
index 208056675c6..6023266f210 100644
--- a/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java
+++ b/Mage.Sets/src/mage/sets/eventide/KithkinSpellduster.java
@@ -70,7 +70,7 @@ public class KithkinSpellduster extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // {1}{W}, Sacrifice Kithkin Spellduster: Destroy target enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}"));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
         // Persist
diff --git a/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java b/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java
index 6dafac41e17..51205989abe 100644
--- a/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java
+++ b/Mage.Sets/src/mage/sets/eventide/RazorfinAbolisher.java
@@ -68,7 +68,7 @@ public class RazorfinAbolisher extends CardImpl {
         // {1}{U}, {tap}: Return target creature with a counter on it to its owner's hand.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{1}{U}"));
         ability.addCost(new TapSourceCost());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java
index 2a0589d4c64..bac4daf59f9 100644
--- a/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java
+++ b/Mage.Sets/src/mage/sets/eventide/ShellSkulkin.java
@@ -63,7 +63,7 @@ public class ShellSkulkin extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(ShroudAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(3));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/SoulReap.java b/Mage.Sets/src/mage/sets/eventide/SoulReap.java
index a8ca79abf52..a38c7cc4ce8 100644
--- a/Mage.Sets/src/mage/sets/eventide/SoulReap.java
+++ b/Mage.Sets/src/mage/sets/eventide/SoulReap.java
@@ -76,7 +76,7 @@ public class SoulReap extends CardImpl {
 
         // Destroy target nongreen creature. Its controller loses 3 life if you've cast another black spell this turn.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new SoulReapEffect(), new CastBlackSpellThisTurnCondition(), rule));
         this.addWatcher(new SoulReapWatcher(this.getId()));
         
diff --git a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java
index c6d2a95c978..ffcf7fc8892 100644
--- a/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java
+++ b/Mage.Sets/src/mage/sets/eventide/WickerboughElder.java
@@ -72,7 +72,7 @@ public class WickerboughElder extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.M1M1.createInstance(1)), false));
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ColoredManaCost(ColoredManaSymbol.G));
         ability.addCost(new RemoveCountersSourceCost(CounterType.M1M1.createInstance(1)));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java
index 3d277559cbe..64009bbf762 100644
--- a/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java
+++ b/Mage.Sets/src/mage/sets/eventide/WildernessHypnotist.java
@@ -67,7 +67,7 @@ public class WildernessHypnotist extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, 0, Duration.EndOfTurn), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java
index 0a17ab53643..262bf53714f 100644
--- a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java
+++ b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java
@@ -101,7 +101,7 @@ class SoltariVisionaryTriggeredAbility extends TriggeredAbilityImpl {
                 filter.add(new ControllerIdPredicate(event.getPlayerId()));
                 filter.setMessage("enchantment controlled by " + game.getPlayer(event.getTargetId()).getName());
                 this.getTargets().clear();
-                this.addTarget(new TargetPermanent(filter));
+                this.addTarget(new TargetPermanent(filter, true));
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java b/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java
index ada18ae0610..d085ddb2ac5 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/EbonyHorse.java
@@ -63,7 +63,7 @@ public class EbonyHorse extends CardImpl {
         ability.addCost(new TapSourceCost());
         ability.addEffect(new PreventCombatDamageToSourceEffect(Duration.EndOfTurn));
         ability.addEffect(new PreventCombatDamageBySourceEffect(Duration.EndOfTurn));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java
index e3eee7538e9..df6212305c1 100644
--- a/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java
+++ b/Mage.Sets/src/mage/sets/futuresight/DaybreakCoronet.java
@@ -69,7 +69,7 @@ public class DaybreakCoronet extends CardImpl {
         this.color.setWhite(true);
 
         // Enchant creature with another Aura attached to it
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java
index c98f611b303..1fec7ed8dce 100644
--- a/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java
+++ b/Mage.Sets/src/mage/sets/futuresight/SlaughterPact.java
@@ -60,7 +60,7 @@ public class SlaughterPact extends CardImpl {
         this.color.setBlack(true);
         
         // Destroy target nonblack creature.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         // At the beginning of your next upkeep, pay {2}{B}. If you don't, you lose the game.
         this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl("{2}{B}")),false));
diff --git a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java
index 155560952df..490b3159f51 100644
--- a/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java
+++ b/Mage.Sets/src/mage/sets/futuresight/WitchsMist.java
@@ -60,7 +60,7 @@ public class WitchsMist extends CardImpl {
 
         // {2}{B}, {T}: Destroy target creature that was dealt damage this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new ManaCostsImpl("{2}{B}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java
index 0b7c6e59d4d..786039c773e 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/AngelicEdict.java
@@ -56,7 +56,7 @@ public class AngelicEdict extends CardImpl {
 
         // Exile target creature or enchantment.
         getSpellAbility().addEffect(new ExileTargetEffect());
-        getSpellAbility().addTarget(new TargetPermanent(filter));
+        getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public AngelicEdict(final AngelicEdict card) {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java
index 1684bd91aa2..5d5aab324f7 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ClanDefiance.java
@@ -69,7 +69,7 @@ public class ClanDefiance extends CardImpl {
         this.getSpellAbility().getModes().setMaxModes(3);
         // Clan Defiance deals X damage to target creature with flying;
         this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue()));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         // Clan Defiance deals X damage to target creature without flying;
         Mode mode1 = new Mode();
         mode1.getEffects().add(new DamageTargetEffect(new ManacostVariableValue()));
diff --git a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java
index d7b43dbbb86..e5d91b062ae 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/FuriousResistance.java
@@ -63,7 +63,7 @@ public class FuriousResistance extends CardImpl {
 
         // Target blocking creature gets +3/+0 and gains first strike until end of turn.
         this.getSpellAbility().addEffect(new FuriousResistanceEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public FuriousResistance(final FuriousResistance card) {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java
index 9ecc1f2308b..cc33fe0b4b2 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GreensideWatcher.java
@@ -65,7 +65,7 @@ public class GreensideWatcher extends CardImpl {
 
         // {tap}: Untap target Gate.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java
index 501df68cbf0..fbdd0f9e339 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GrislySpectacle.java
@@ -66,7 +66,7 @@ public class GrislySpectacle extends CardImpl {
         // Destroy target nonartifact creature. Its controller puts a number of cards equal to that creature's power from the top of his or her library into his or her graveyard.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new GrislySpectacleEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public GrislySpectacle(final GrislySpectacle card) {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java
index 26e68556e17..675e91da1fd 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/HandsOfBinding.java
@@ -60,7 +60,7 @@ public class HandsOfBinding extends CardImpl {
         //Tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
         this.getSpellAbility().addEffect(new TapTargetEffect());
         this.getSpellAbility().addEffect(new SkipNextUntapTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         //Cipher 
         this.getSpellAbility().addEffect(new CipherEffect());
         
diff --git a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java
index 8bcb53c71ad..fc6bf5f8003 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/KillingGlare.java
@@ -69,7 +69,7 @@ public class KillingGlare extends CardImpl {
             ability.getTargets().clear();
             FilterCreaturePermanent filter = new FilterCreaturePermanent(new StringBuilder("creature with power ").append(xValue).append(" or less").toString());
             filter.add(new PowerPredicate(Filter.ComparisonType.LessThan, xValue + 1));
-            ability.addTarget(new TargetCreaturePermanent(filter));
+            ability.addTarget(new TargetCreaturePermanent(filter, true));
         }
     }
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java
index 6f01d876675..de5f10f79f4 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/MarkForDeath.java
@@ -70,7 +70,7 @@ public class MarkForDeath extends CardImpl {
 
         // Target creature an opponent controls blocks this turn if able. Untap that creature. Other creatures that player controls can't block this turn.
         this.getSpellAbility().addEffect(new MarkForDeathEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public MarkForDeath(final MarkForDeath card) {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
index 574b2a2b29a..7c93299204a 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
@@ -104,7 +104,7 @@ class BecomesBlockedTriggeredAbility extends TriggeredAbilityImpl {
                 FilterPermanent filter = new FilterPermanent("artifact or enchantment defending player controls");
                 filter.add(Predicates.or(new CardTypePredicate(CardType.ARTIFACT), new CardTypePredicate(CardType.ENCHANTMENT)));
                 filter.add(new ControllerIdPredicate(defenderId));
-                Target target = new TargetPermanent(filter);
+                Target target = new TargetPermanent(filter, true);
                 this.addTarget(target);
                 return true;
             }
diff --git a/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java
index d0821c1b35e..3e47e930bd0 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/SimicManipulator.java
@@ -83,7 +83,7 @@ public class SimicManipulator extends CardImpl {
         // TODO: Improve targeting, that only valid targets (power <= removed counters) can be choosen
         //       Disadvantage now is, that a creature can be targeted that couldn't be targeted by rules.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SimicManipulatorGainControlTargetEffect(Duration.Custom), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addCost(new RemoveVariableCountersSourceCost(CounterType.P1P1.createInstance(),1));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java
index cf73dbbc5f7..019fc87ac02 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/StolenIdentity.java
@@ -65,7 +65,7 @@ public class StolenIdentity extends CardImpl {
 
         // Put a token onto the battlefield that's a copy of target artifact or creature.
         this.getSpellAbility().addEffect(new StolenIdentityEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         // Cipher
         this.getSpellAbility().addEffect(new CipherEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/guildpact/Mortify.java b/Mage.Sets/src/mage/sets/guildpact/Mortify.java
index fe1a72d7ee7..f34c79b1352 100644
--- a/Mage.Sets/src/mage/sets/guildpact/Mortify.java
+++ b/Mage.Sets/src/mage/sets/guildpact/Mortify.java
@@ -56,7 +56,7 @@ public class Mortify extends CardImpl {
         this.color.setBlack(true);
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Mortify(final Mortify card) {
diff --git a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java
index 37659712bf1..15d4899c031 100644
--- a/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java
+++ b/Mage.Sets/src/mage/sets/guildpact/OrzhovEuthanist.java
@@ -64,7 +64,7 @@ public class OrzhovEuthanist extends CardImpl {
         // Haunt
         // When Orzhov Euthanist enters the battlefield or the creature it haunts dies, destroy target creature that was dealt damage this turn.
         Ability ability = new HauntAbility(this, new DestroyTargetEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java
index 718e56db204..5c6f594e71f 100644
--- a/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java
+++ b/Mage.Sets/src/mage/sets/guildpact/WreakHavoc.java
@@ -59,7 +59,7 @@ public class WreakHavoc extends CardImpl {
         this.color.setGreen(true);
         this.addAbility(new CantCounterAbility());
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public WreakHavoc(final WreakHavoc card) {
diff --git a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java
index a2cfecfd7e0..f4cf438113a 100644
--- a/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java
+++ b/Mage.Sets/src/mage/sets/guildpact/WurmweaverCoil.java
@@ -65,7 +65,7 @@ public class WurmweaverCoil extends CardImpl {
         this.expansionSetCode = "GPT";
         this.subtype.add("Aura");
         this.color.setGreen(true);
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Benefit));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/iceage/ElderDruid.java b/Mage.Sets/src/mage/sets/iceage/ElderDruid.java
index a9e95f383cd..118b8f18c37 100644
--- a/Mage.Sets/src/mage/sets/iceage/ElderDruid.java
+++ b/Mage.Sets/src/mage/sets/iceage/ElderDruid.java
@@ -72,7 +72,7 @@ public class ElderDruid extends CardImpl {
         // {3}{G}, {tap}: You may tap or untap target artifact, creature, or land.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new ManaCostsImpl("{3}{G}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/iceage/TinderWall.java b/Mage.Sets/src/mage/sets/iceage/TinderWall.java
index bfeed21e545..6321166be76 100644
--- a/Mage.Sets/src/mage/sets/iceage/TinderWall.java
+++ b/Mage.Sets/src/mage/sets/iceage/TinderWall.java
@@ -78,7 +78,7 @@ public class TinderWall extends CardImpl {
         FilterAttackingCreature filter = new FilterAttackingCreature("creature it's blocking");
         filter.add(new BlockingByPredicate(this.getId()));
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
         
diff --git a/Mage.Sets/src/mage/sets/iceage/Vertigo.java b/Mage.Sets/src/mage/sets/iceage/Vertigo.java
index cd6c0a80158..70e21a29ccd 100644
--- a/Mage.Sets/src/mage/sets/iceage/Vertigo.java
+++ b/Mage.Sets/src/mage/sets/iceage/Vertigo.java
@@ -60,7 +60,7 @@ public class Vertigo extends CardImpl {
         // Vertigo deals 2 damage to target creature with flying. That creature loses flying until end of turn.
         this.getSpellAbility().addEffect(new DamageTargetEffect(2));
         this.getSpellAbility().addEffect(new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public Vertigo(final Vertigo card) {
diff --git a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java
index 96aadf31d6a..310589027db 100644
--- a/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java
+++ b/Mage.Sets/src/mage/sets/innistrad/AncientGrudge.java
@@ -59,7 +59,7 @@ public class AncientGrudge extends CardImpl {
 
         // Destroy target artifact.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
 
         // Flashback {G}
         this.addAbility(new FlashbackAbility(new ManaCostsImpl("{G}"), TimingRule.INSTANT));
diff --git a/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java
index 770a20dae02..74519862d91 100644
--- a/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java
+++ b/Mage.Sets/src/mage/sets/innistrad/AvacynianPriest.java
@@ -68,7 +68,7 @@ public class AvacynianPriest extends CardImpl {
         // {1}, {T}: Tap target non-Human creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java
index 3216c0092a9..26114410dff 100644
--- a/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java
+++ b/Mage.Sets/src/mage/sets/innistrad/Bramblecrush.java
@@ -56,7 +56,7 @@ public class Bramblecrush extends CardImpl {
         this.color.setGreen(true);
 
         // Destroy target noncreature permanent.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java
index bf8c8ae6e3b..b4c889a700e 100644
--- a/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java
+++ b/Mage.Sets/src/mage/sets/innistrad/DaybreakRanger.java
@@ -77,7 +77,7 @@ public class DaybreakRanger extends CardImpl {
 
         // {tap}: Daybreak Ranger deals 2 damage to target creature with flying.
         Ability activatedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new TapSourceCost());
-        activatedAbility.addTarget(new TargetCreaturePermanent(filter));
+        activatedAbility.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(activatedAbility);
         // At the beginning of each upkeep, if no spells were cast last turn, transform Daybreak Ranger.
         this.addAbility(new TransformAbility());
diff --git a/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java b/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java
index de5aac94ab7..7dfd74b5c3c 100644
--- a/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java
+++ b/Mage.Sets/src/mage/sets/innistrad/EvilTwin.java
@@ -95,7 +95,7 @@ class EvilTwinApplyToPermanent extends ApplyToPermanent {
     public Boolean apply(Game game, Permanent permanent) {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{U}{B}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         permanent.addAbility(ability, game);
         return true;
     }
diff --git a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java
index 088378f0f06..4a63252214b 100644
--- a/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java
+++ b/Mage.Sets/src/mage/sets/innistrad/FiendHunter.java
@@ -66,7 +66,7 @@ public class FiendHunter extends CardImpl {
 
         // When Fiend Hunter enters the battlefield, you may exile another target creature.
         Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect("Fiend Hunter Exile"), true);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability1.addTarget(target);
         this.addAbility(ability1);
diff --git a/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java b/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java
index 1faeb2acf27..41a872dd178 100644
--- a/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java
+++ b/Mage.Sets/src/mage/sets/innistrad/GeistcatchersRig.java
@@ -61,7 +61,7 @@ public class GeistcatchersRig extends CardImpl {
         this.toughness = new MageInt(5);
         // When Geistcatcher's Rig enters the battlefield, you may have it deal 4 damage to target creature with flying.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(4), true);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java
index cc1213a6aa8..e1eaed00f95 100644
--- a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java
+++ b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java
@@ -116,7 +116,7 @@ class GrimgrinCorpseBornAbility extends TriggeredAbilityImpl {
             filter.add(new ControllerIdPredicate(defenderId));
 
             this.getTargets().clear();
-            TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+            TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
             target.setRequired(true);
             this.addTarget(target);
             return true;
diff --git a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java
index 3f132f3fc41..12b12633284 100644
--- a/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java
+++ b/Mage.Sets/src/mage/sets/innistrad/OliviaVoldaren.java
@@ -86,7 +86,7 @@ public class OliviaVoldaren extends CardImpl {
 
         // {1}{R}: Olivia Voldaren deals 1 damage to another target creature. That creature becomes a Vampire in addition to its other types. Put a +1/+1 counter on Olivia Voldaren.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new ManaCostsImpl("{1}{R}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addEffect(new AddCardSubTypeTargetEffect("Vampire", Duration.WhileOnBattlefield));
         ability.addEffect(new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java
index 43d94205b21..5e1c24616f7 100644
--- a/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java
+++ b/Mage.Sets/src/mage/sets/innistrad/PreyUpon.java
@@ -60,7 +60,7 @@ public class PreyUpon extends CardImpl {
         // Target creature you control fights target creature you don't control.
         this.getSpellAbility().addEffect(new FightTargetsEffect());
         this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java
index 4dd89f5cf7a..5276e9e0cda 100644
--- a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java
+++ b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java
@@ -69,7 +69,7 @@ public class ReaperFromTheAbyss extends CardImpl {
 
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new ReaperFromTheAbyssAbility();
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java
index 8c691c0651c..945b23071c1 100644
--- a/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java
+++ b/Mage.Sets/src/mage/sets/innistrad/SilverchaseFox.java
@@ -65,7 +65,7 @@ public class SilverchaseFox extends CardImpl {
 
         // {1}{W}, Sacrifice Silverchase Fox: Exile target enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ManaCostsImpl("{1}{W}"));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java
index 8aedd8e60ae..85a0a1988e4 100644
--- a/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java
+++ b/Mage.Sets/src/mage/sets/innistrad/SlayerOfTheWicked.java
@@ -67,7 +67,7 @@ public class SlayerOfTheWicked extends CardImpl {
 
         // When Slayer of the Wicked enters the battlefield, you may destroy target Vampire, Werewolf, or Zombie.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java
index 0efffacc97b..06b8ff0cb0d 100644
--- a/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java
+++ b/Mage.Sets/src/mage/sets/innistrad/SmiteTheMonstrous.java
@@ -56,7 +56,7 @@ public class SmiteTheMonstrous extends CardImpl {
 
         // Destroy target creature with power 4 or greater.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public SmiteTheMonstrous(final SmiteTheMonstrous card) {
diff --git a/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java
index 6a1dddcedd1..a40bf42ad76 100644
--- a/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java
+++ b/Mage.Sets/src/mage/sets/innistrad/UrgentExorcism.java
@@ -61,7 +61,7 @@ public class UrgentExorcism extends CardImpl {
 
         // Destroy target Spirit or enchantment.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public UrgentExorcism(final UrgentExorcism card) {
diff --git a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java
index dbe084a7bc7..c9c0843fb2e 100644
--- a/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java
+++ b/Mage.Sets/src/mage/sets/innistrad/VictimOfNight.java
@@ -58,7 +58,7 @@ public class VictimOfNight extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target non-Vampire, non-Werewolf, non-Zombie creature.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java
index 3eb25724a08..380146142f8 100644
--- a/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java
+++ b/Mage.Sets/src/mage/sets/invasion/SpinalEmbrace.java
@@ -78,7 +78,7 @@ public class SpinalEmbrace extends CardImpl {
         ability.setRuleAtTheTop(true);
         this.addAbility(ability);
         // Untap target creature you don't control and gain control of it. It gains haste until end of turn. At the beginning of the next end step, sacrifice it. If you do, you gain life equal to its toughness.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new UntapTargetEffect());
         Effect effect = new GainControlTargetEffect(Duration.EndOfTurn);
         effect.setText("and gain control of it");
diff --git a/Mage.Sets/src/mage/sets/legends/Karakas.java b/Mage.Sets/src/mage/sets/legends/Karakas.java
index f62a0489904..568ac2c8ae8 100644
--- a/Mage.Sets/src/mage/sets/legends/Karakas.java
+++ b/Mage.Sets/src/mage/sets/legends/Karakas.java
@@ -62,7 +62,7 @@ public class Karakas extends CardImpl {
         this.addAbility(new WhiteManaAbility());
         // {tap}: Return target legendary creature to its owner's hand.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java b/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java
index 28a4ebe4326..ac11b132923 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/AnimateWall.java
@@ -67,7 +67,7 @@ public class AnimateWall extends CardImpl {
         this.color.setWhite(true);
 
         // Enchant Wall
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java b/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java
index 7637f88a138..47fd5a8b862 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CopyArtifact.java
@@ -99,7 +99,7 @@ class CopyArtifactEffect extends OneShotEffect {
         Player player = game.getPlayer(source.getControllerId());
         Permanent sourcePermanent = game.getPermanent(source.getSourceId());
         if (player != null && sourcePermanent != null) {
-            Target target = new TargetPermanent(filter);
+            Target target = new TargetPermanent(filter, true);
             if (target.canChoose(source.getControllerId(), game)) {
                 player.choose(Outcome.Copy, target, source.getSourceId(), game);
                 Permanent copyFromPermanent = game.getPermanent(target.getFirstTarget());
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java
index a589540a93b..b71428831ab 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/NorthernPaladin.java
@@ -68,7 +68,7 @@ public class NorthernPaladin extends CardImpl {
         // {W}{W}, {tap}: Destroy target black permanent.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{W}{W}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java
index dc7770624b0..20fae43cf1b 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/BlackPoplarShaman.java
@@ -63,7 +63,7 @@ public class BlackPoplarShaman extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{2}{B}"));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java
index 008a995d22b..9a9ddd0d195 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/EyeblightsEnding.java
@@ -56,7 +56,7 @@ public class EyeblightsEnding extends CardImpl {
         this.subtype.add("Elf");
         this.color.setBlack(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public EyeblightsEnding(final EyeblightsEnding card) {
diff --git a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java
index d9965480cf4..9b00b5a89ff 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/GlimmerdustNap.java
@@ -62,7 +62,7 @@ public class GlimmerdustNap extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant tapped creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
diff --git a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
index 7ead57f564f..c142e239700 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
@@ -65,7 +65,7 @@ public class Goatnapper extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         ability.addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
         ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java
index 5d73859cc04..328f9dee5cc 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/NectarFaerie.java
@@ -68,7 +68,7 @@ public class NectarFaerie extends CardImpl {
         // {B}, {tap}: Target Faerie or Elf gains lifelink until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), new ColoredManaCost(ColoredManaSymbol.B));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java b/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java
index 45421c29726..e0dcdf91846 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/StreambedAquitects.java
@@ -71,7 +71,7 @@ public class StreambedAquitects extends CardImpl {
         // {tap}: Target Merfolk creature gets +1/+1 and gains islandwalk until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1,1, Duration.EndOfTurn), new TapSourceCost());
         ability.addEffect(new GainAbilityTargetEffect(new IslandwalkAbility(), Duration.EndOfTurn));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java
index 702304c4a35..ba7b7b8867d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java
+++ b/Mage.Sets/src/mage/sets/magic2010/AcidicSlime.java
@@ -68,7 +68,7 @@ public class AcidicSlime extends CardImpl {
 
         this.addAbility(DeathtouchAbility.getInstance());
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java
index d94f407b6e4..ebb0d56dcb0 100644
--- a/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java
+++ b/Mage.Sets/src/mage/sets/magic2010/AlluringSiren.java
@@ -64,7 +64,7 @@ public class AlluringSiren extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java
index aaf05abbadd..004f53a45c3 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DoomBlade.java
@@ -55,7 +55,7 @@ public class DoomBlade extends CardImpl {
         super(ownerId, 93, "Doom Blade", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{B}");
         this.expansionSetCode = "M10";
         this.color.setBlack(true);
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java
index c1062f9dcdf..fd2c2908bb3 100644
--- a/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java
+++ b/Mage.Sets/src/mage/sets/magic2010/EntanglingVines.java
@@ -62,7 +62,7 @@ public class EntanglingVines extends CardImpl {
         this.color.setGreen(true);
 
         // Enchant tapped creature
-        TargetPermanent auraTarget = new TargetCreaturePermanent(filter);
+        TargetPermanent auraTarget = new TargetCreaturePermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
diff --git a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
index 3169c5ea0ae..939a63568ae 100644
--- a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
+++ b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
@@ -106,7 +106,7 @@ class LightwielderPaladinTriggeredAbility extends TriggeredAbilityImpl {
                 filter.add(new ControllerIdPredicate(event.getTargetId()));
 
                 this.getTargets().clear();
-                this.addTarget(new TargetPermanent(filter));
+                this.addTarget(new TargetPermanent(filter, true));
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java
index c0cc2fdc5f8..a84ee8ba049 100644
--- a/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java
+++ b/Mage.Sets/src/mage/sets/magic2010/SolemnOffering.java
@@ -57,7 +57,7 @@ public class SolemnOffering extends CardImpl {
         super(ownerId, 33, "Solemn Offering", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{W}");
         this.expansionSetCode = "M10";
         this.color.setWhite(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new GainLifeEffect(4));
     }
diff --git a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java
index 1d0fbb1184b..a570e3e8a23 100644
--- a/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java
+++ b/Mage.Sets/src/mage/sets/magic2010/UndeadSlayer.java
@@ -70,7 +70,7 @@ public class UndeadSlayer extends CardImpl {
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AirServant.java b/Mage.Sets/src/mage/sets/magic2011/AirServant.java
index b5c91b91158..64ab6f38209 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AirServant.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AirServant.java
@@ -64,7 +64,7 @@ public class AirServant extends CardImpl {
         this.toughness = new MageInt(3);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{2}{U}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java
index f18fcfce239..8a116f2df35 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java
@@ -104,7 +104,7 @@ class AncientHellkiteAbility extends ActivatedAbilityImpl {
             filter.add(new ControllerIdPredicate(defenderId));
 
             this.getTargets().clear();
-            TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+            TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
             target.setRequired(true);
             this.addTarget(target);
             return super.activate(game, noMana);
diff --git a/Mage.Sets/src/mage/sets/magic2011/Combust.java b/Mage.Sets/src/mage/sets/magic2011/Combust.java
index 03313773584..f05b35f5d50 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Combust.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Combust.java
@@ -61,7 +61,7 @@ public class Combust extends CardImpl {
         this.expansionSetCode = "M11";
         this.color.setRed(true);
         this.getSpellAbility().addEffect(new DamageTargetEffect(5, false));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(new SimpleStaticAbility(Zone.STACK, new CantCounterSourceEffect()));
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java
index d585d7ce8b3..f79f1d6bf3b 100644
--- a/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java
+++ b/Mage.Sets/src/mage/sets/magic2011/CyclopsGladiator.java
@@ -91,7 +91,7 @@ class CyclopsGladiatorEffect extends OneShotEffect {
         if (defenderId != null) {
             FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls");
             filter.add(new ControllerIdPredicate(defenderId));
-            TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+            TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
             Player player = game.getPlayer(source.getControllerId());
             if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) {
                 if (player.chooseTarget(Outcome.Detriment, target, source, game)) {
diff --git a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java
index be0b7ddde30..fe3fab2e2bd 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ManicVandal.java
@@ -63,7 +63,7 @@ public class ManicVandal extends CardImpl {
         this.toughness = new MageInt(2);
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java
index e4c3b635e81..79c435c4703 100644
--- a/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java
+++ b/Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java
@@ -67,7 +67,7 @@ public class MystifyingMaze extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MystifyingMazeEffect(), new ManaCostsImpl("{4}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java
index 51d6444110b..5b2bb2d154f 100644
--- a/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java
+++ b/Mage.Sets/src/mage/sets/magic2011/NecroticPlague.java
@@ -102,7 +102,7 @@ public class NecroticPlague extends CardImpl {
                 if (creatureController != null) {
                     ability.setControllerId(creatureController.getId());
                     ability.getTargets().clear();
-                    TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+                    TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
                     target.setRequired(true);
                     ability.getTargets().add(target);
                 }
diff --git a/Mage.Sets/src/mage/sets/magic2011/Plummet.java b/Mage.Sets/src/mage/sets/magic2011/Plummet.java
index b9c51435f21..73a12b01515 100644
--- a/Mage.Sets/src/mage/sets/magic2011/Plummet.java
+++ b/Mage.Sets/src/mage/sets/magic2011/Plummet.java
@@ -55,7 +55,7 @@ public class Plummet extends CardImpl {
         super(ownerId, 190, "Plummet", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{1}{G}");
         this.expansionSetCode = "M11";
         this.color.setGreen(true);
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java
index ee7afbed222..bc1a90d6365 100644
--- a/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java
+++ b/Mage.Sets/src/mage/sets/magic2011/VoltaicKey.java
@@ -59,7 +59,7 @@ public class VoltaicKey extends CardImpl {
         this.expansionSetCode = "M11";
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost());
         ability.addManaCost(new GenericManaCost(1));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java
index 17ea2f3fb9f..8d801349a42 100644
--- a/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java
+++ b/Mage.Sets/src/mage/sets/magic2011/WarPriestOfThune.java
@@ -64,7 +64,7 @@ public class WarPriestOfThune extends CardImpl {
 
         // When War Priest of Thune enters the battlefield, you may destroy target enchantment.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java
index 1295385e12a..4160969b9a0 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AegisAngel.java
@@ -76,7 +76,7 @@ public class AegisAngel extends CardImpl {
                 new SourceOnBattlefieldControlUnchangedCondition(),
                 "another target permanent is indestructible for as long as you control Aegis Angel");
         Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java
index d1e6edec895..72ca4a8901c 100644
--- a/Mage.Sets/src/mage/sets/magic2012/MasterThief.java
+++ b/Mage.Sets/src/mage/sets/magic2012/MasterThief.java
@@ -68,7 +68,7 @@ public class MasterThief extends CardImpl {
                 new SourceOnBattlefieldControlUnchangedCondition(),
                 "gain control of target artifact for as long as you control Master Thief");
         Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java
index 3fe7515887f..2d64284ed73 100644
--- a/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java
+++ b/Mage.Sets/src/mage/sets/magic2012/StingerflingSpider.java
@@ -63,7 +63,7 @@ public class StingerflingSpider extends CardImpl {
         this.toughness = new MageInt(5);
         this.addAbility(ReachAbility.getInstance());
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java
index 59802d658ca..b4cc4977291 100644
--- a/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java
+++ b/Mage.Sets/src/mage/sets/magic2013/DiscipleOfBolas.java
@@ -68,7 +68,7 @@ public class DiscipleOfBolas extends CardImpl {
 
         // When Disciple of Bolas enters the battlefield, sacrifice another creature. You gain X life and draw X cards, where X is that creature's power.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DiscipleOfBolasEffect());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/Encrust.java b/Mage.Sets/src/mage/sets/magic2013/Encrust.java
index e88c8c9ccf4..2af22110d05 100644
--- a/Mage.Sets/src/mage/sets/magic2013/Encrust.java
+++ b/Mage.Sets/src/mage/sets/magic2013/Encrust.java
@@ -67,7 +67,7 @@ public class Encrust extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant artifact or creature
-        TargetPermanent auraTarget = new TargetPermanent(filter);
+        TargetPermanent auraTarget = new TargetPermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java
index 85b5e541b8c..4c0bf19fcb7 100644
--- a/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java
+++ b/Mage.Sets/src/mage/sets/magic2013/PublicExecution.java
@@ -65,7 +65,7 @@ public class PublicExecution extends CardImpl {
 
         // Destroy target creature an opponent controls. Each other creature that player controls gets -2/-0 until end of turn.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new PublicExecutionEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java b/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java
index 7e3cf5cd6dd..4df30e35e54 100644
--- a/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java
+++ b/Mage.Sets/src/mage/sets/magic2014/AdvocateOfTheBeast.java
@@ -67,7 +67,7 @@ public class AdvocateOfTheBeast extends CardImpl {
 
         // At the beginning of your end step, put a +1/+1 counter on target Beast creature you control.
         Ability ability = new BeginningOfEndStepTriggeredAbility(new AddCountersTargetEffect(CounterType.P1P1.createInstance()), TargetController.YOU, false);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java b/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java
index 623c97ef5a9..6e9ca52476a 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ArtificersHex.java
@@ -66,7 +66,7 @@ public class ArtificersHex extends CardImpl {
         this.color.setBlack(true);
 
         // Enchant Equipment
-        TargetPermanent auraTarget = new TargetPermanent(filter);
+        TargetPermanent auraTarget = new TargetPermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java
index cbec2ba2ef3..38930b4c37a 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java
@@ -104,7 +104,7 @@ class ColossalWhaleAbility extends TriggeredAbilityImpl {
             filter.add(new ControllerIdPredicate(defenderId));
 
             this.getTargets().clear();
-            TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+            TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
             target.setRequired(true);
             this.addTarget(target);
             return true;
diff --git a/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java b/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java
index f30627e1f2d..056573c6a4b 100644
--- a/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java
+++ b/Mage.Sets/src/mage/sets/magic2014/FleshpulperGiant.java
@@ -63,7 +63,7 @@ public class FleshpulperGiant extends CardImpl {
 
         // When Fleshpulper Giant enters the battlefield, you may destroy target creature with toughness 2 or less.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         
     }
diff --git a/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java b/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java
index d6485f07c89..2c1f9aa0365 100644
--- a/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java
+++ b/Mage.Sets/src/mage/sets/magic2014/HuntTheWeak.java
@@ -67,7 +67,7 @@ public class HuntTheWeak extends CardImpl {
         effect.setText("Then that creature fights target creature you don't control");
         this.getSpellAbility().addEffect(effect);
         this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
 
diff --git a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java
index a796d8b27e0..9c63e8df0d5 100644
--- a/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java
+++ b/Mage.Sets/src/mage/sets/magic2014/MasterOfDiversion.java
@@ -75,7 +75,7 @@ public class MasterOfDiversion extends CardImpl {
             FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls");
             UUID defenderId = game.getCombat().getDefenderId(ability.getSourceId());
             filter.add(new ControllerIdPredicate(defenderId));
-            TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+            TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
             target.setRequired(true);
             ability.addTarget(target);
         }
diff --git a/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java
index fd1f12f1a0a..7bd8f67e90c 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ShadowbornDemon.java
@@ -77,7 +77,7 @@ public class ShadowbornDemon extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // When Shadowborn Demon enters the battlefield, destroy target non-Demon creature.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(),false);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java
index 382100de98d..a7110c5d2a0 100644
--- a/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java
+++ b/Mage.Sets/src/mage/sets/magic2014/TidebinderMage.java
@@ -81,7 +81,7 @@ public class TidebinderMage extends CardImpl {
         // That creature doesn't untap during its controller's untap step for as long as you control Tidebinder Mage.
         Ability ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect(), false);
         ability.addEffect(new TidebinderMageEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java
index ec8a86843a3..a674d6f0992 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AltarsLight.java
@@ -56,7 +56,7 @@ public class AltarsLight extends CardImpl {
         this.expansionSetCode = "MRD";
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new ExileTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public AltarsLight(final AltarsLight card) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java
index dc348c95cd9..9ec12cd1272 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/AuriokTransfixer.java
@@ -65,7 +65,7 @@ public class AuriokTransfixer extends CardImpl {
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java
index 14dc277f9a0..076eaa7c6f6 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Deconstruct.java
@@ -55,7 +55,7 @@ public class Deconstruct extends CardImpl {
         this.expansionSetCode = "MRD";
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 3, 0, 0, 0, 0, 0)));
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java b/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java
index 012ff4a1d9c..b818f109196 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Duplicant.java
@@ -71,7 +71,7 @@ public class Duplicant extends CardImpl {
 
         // Imprint - When Duplicant enters the battlefield, you may exile target nontoken creature.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect(), true, "<i>Imprint - </i>");
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         // As long as the exiled card is a creature card, Duplicant has that card's power, toughness, and creature types. It's still a Shapeshifter.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DuplicantContinuousEffect()));
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java
index 13842387642..668a056b6e3 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ElfReplica.java
@@ -63,7 +63,7 @@ public class ElfReplica extends CardImpl {
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{G}"));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java
index 57fba23da17..02f831d60b5 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GalvanicKey.java
@@ -61,7 +61,7 @@ public class GalvanicKey extends CardImpl {
         this.addAbility(FlashAbility.getInstance());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new GenericManaCost(3));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java
index d5b315d609b..9dea81090e9 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/GoblinReplica.java
@@ -63,7 +63,7 @@ public class GoblinReplica extends CardImpl {
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}"));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java
index 033a57cffc7..ff667fdaca0 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LoomingHoverguard.java
@@ -61,7 +61,7 @@ public class LoomingHoverguard extends CardImpl {
         this.toughness = new MageInt(3);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new EntersBattlefieldTriggeredAbility(new PutOnLibraryTargetEffect(true), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java
index 6d2dcd65345..c331541944c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/LoxodonMender.java
@@ -65,7 +65,7 @@ public class LoxodonMender extends CardImpl {
         this.toughness = new MageInt(3);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ColoredManaCost(ColoredManaSymbol.W));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java
index ea823b712e3..019556c560c 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/RustsporeRam.java
@@ -58,7 +58,7 @@ public class RustsporeRam extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java
index 6d7f66fcf38..446e8db9dd4 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Shatter.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Shatter.java
@@ -53,7 +53,7 @@ public class Shatter extends CardImpl {
         this.expansionSetCode = "MRD";
         this.color.setRed(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Shatter (final Shatter card) {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java
index 7afb8b64482..422ef61d61f 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TrollsOfTelJilad.java
@@ -64,7 +64,7 @@ public class TrollsOfTelJilad extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(6);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}{G}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java
index cc3b19889c3..e3d14ca51cf 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/TurnToDust.java
@@ -55,7 +55,7 @@ public class TurnToDust extends CardImpl {
         this.expansionSetCode = "MRD";
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new BasicManaEffect(new Mana(0, 1, 0, 0, 0, 0, 0)));
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java
index 50870a6cdc5..7cea88ebbdc 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/BanishmentDecree.java
@@ -57,7 +57,7 @@ public class BanishmentDecree extends CardImpl {
         this.expansionSetCode = "MBS";
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public BanishmentDecree (final BanishmentDecree card) {
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java
index cd1fe942323..4b539759eeb 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Cryptoplasm.java
@@ -65,7 +65,7 @@ public class Cryptoplasm extends CardImpl {
 
         // At the beginning of your upkeep, you may have Cryptoplasm become a copy of another target creature. If you do, Cryptoplasm gains this ability.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new CryptoplasmTransformEffect(), TargetController.YOU, true);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java
index 9bf43fb3c32..9ca9a0d8fd5 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GoForTheThroat.java
@@ -55,7 +55,7 @@ public class GoForTheThroat extends CardImpl {
         this.expansionSetCode = "MBS";
         this.color.setBlack(true);
 
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setTargetName("nonartifact creature");
         this.getSpellAbility().addTarget(target);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java
index ace62d94dbf..9d9a2a8264c 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/IntoTheCore.java
@@ -54,8 +54,8 @@ public class IntoTheCore extends CardImpl {
 
         this.color.setRed(true);
 
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new ExileTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java
index 91d1148337b..bb910a23439 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/LeoninRelicWarder.java
@@ -69,7 +69,7 @@ public class LeoninRelicWarder extends CardImpl {
         this.toughness = new MageInt(2);
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect("Leonin Relic-Warder exile"), true);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java
index 4a55713bca8..375129e3cc6 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MetallicMastery.java
@@ -58,7 +58,7 @@ public class MetallicMastery extends CardImpl {
 
         this.color.setRed(true);
 
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new GainControlTargetEffect(Duration.EndOfTurn));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn));
         this.getSpellAbility().addEffect(new UntapTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java
index 1df4d87cf4f..1b61cf8cf94 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/PistusStrike.java
@@ -63,7 +63,7 @@ public class PistusStrike extends CardImpl {
         this.expansionSetCode = "MBS";
         this.color.setGreen(true);
 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new PoisonControllerTargetCreatureEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java
index 2dceff0a8fa..207bd94a68f 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ViridianCorrupter.java
@@ -65,7 +65,7 @@ public class ViridianCorrupter extends CardImpl {
         this.addAbility(InfectAbility.getInstance());
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java
index acd44721d52..33076570d2b 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java
@@ -107,7 +107,7 @@ class TrygonPredatorTriggeredAbility extends TriggeredAbilityImpl {
                 filter.add(new ControllerIdPredicate(event.getTargetId()));
 
                 this.getTargets().clear();
-                this.addTarget(new TargetPermanent(filter));
+                this.addTarget(new TargetPermanent(filter, true));
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java
index f4b7c88efc1..eea41897605 100644
--- a/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java
+++ b/Mage.Sets/src/mage/sets/morningtide/Stingmoggie.java
@@ -71,7 +71,7 @@ public class Stingmoggie extends CardImpl {
         this.addAbility(new EntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), false));
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}"));
         ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java
index 19aff854bc9..3c18e6accd2 100644
--- a/Mage.Sets/src/mage/sets/morningtide/VioletPall.java
+++ b/Mage.Sets/src/mage/sets/morningtide/VioletPall.java
@@ -57,7 +57,7 @@ public class VioletPall extends CardImpl {
         this.subtype.add("Faerie");
         this.color.setBlack(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new CreateTokenEffect(new FaerieToken(), 1));
     }
 
diff --git a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java
index ee6a4bb5a80..85bf6a49382 100644
--- a/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java
+++ b/Mage.Sets/src/mage/sets/nemesis/SealOfCleansing.java
@@ -64,7 +64,7 @@ public class SealOfCleansing extends CardImpl {
 
         // Sacrifice Seal of Cleansing: Destroy target artifact or enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
index f2471017fc1..3db76ed8ec7 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
@@ -95,7 +95,7 @@ class ArmWithAEtherTriggeredAbility extends TriggeredAbilityImpl {
             filter.add(new ControllerIdPredicate(opponent.getId()));
 
             this.getTargets().clear();
-            this.addTarget(new TargetCreaturePermanent(filter));
+            this.addTarget(new TargetCreaturePermanent(filter, true));
             return true;
         }
         return false;
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
index 67204257797..3b2997f191b 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
@@ -113,7 +113,7 @@ class BlindZealotTriggeredAbility extends TriggeredAbilityImpl {
                     filter.setMessage("creature controlled by " + game.getPlayer(event.getTargetId()).getName());
 
                     this.getTargets().clear();
-                    this.addTarget(new TargetCreaturePermanent(filter));
+                    this.addTarget(new TargetCreaturePermanent(filter, true));
                     return true;
                 }
             }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java
index fc62b32bd21..39b0c9a1dfb 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/BrutalizerExarch.java
@@ -75,7 +75,7 @@ public class BrutalizerExarch extends CardImpl {
         Ability ability = new EntersBattlefieldTriggeredAbility(new BrutalizerExarchEffect1());
         Mode mode = new Mode();
         mode.getEffects().add(new BrutalizerExarchEffect2());
-        mode.getTargets().add(new TargetPermanent(filter));
+        mode.getTargets().add(new TargetPermanent(filter, true));
         ability.addMode(mode);
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java
index f75ef8836db..11fe0bb3998 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/DeceiverExarch.java
@@ -71,7 +71,7 @@ public class DeceiverExarch extends CardImpl {
         ability.addTarget(new TargetControlledPermanent(true));
         Mode mode = new Mode();
         mode.getEffects().add(new TapTargetEffect());
-        mode.getTargets().add(new TargetPermanent(filter));
+        mode.getTargets().add(new TargetPermanent(filter, true));
         ability.addMode(mode);
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java
index 036dddac295..1ae2a886fcc 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ExclusionRitual.java
@@ -63,7 +63,7 @@ public class ExclusionRitual extends CardImpl {
 
         // Imprint - When Exclusion Ritual enters the battlefield, exile target nonland permanent.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ExclusionRitualImprintEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
         // Players can't cast spells with the same name as the exiled card.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ExclusionRitualReplacementEffect()));
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java
index 99fd3c8d181..df435ae7743 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java
@@ -68,7 +68,7 @@ public class NumbingDose extends CardImpl {
 
         this.color.setBlue(true);
 
-        TargetPermanent auraTarget = new TargetPermanent(filter);
+        TargetPermanent auraTarget = new TargetPermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java
index cdede6ba209..d05976d5c53 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianIngester.java
@@ -73,7 +73,7 @@ public class PhyrexianIngester extends CardImpl {
 
         // Imprint - When Phyrexian Ingester enters the battlefield, you may exile target nontoken creature.
         Ability ability = new EntersBattlefieldTriggeredAbility(new PhyrexianIngesterImprintEffect(), true);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
         // Phyrexian Ingester gets +X/+Y, where X is the exiled creature card's power and Y is its toughness.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PhyrexianIngesterBoostEffect()));
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
index c09c0b6d6c8..3de6ab24a88 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianMetamorph.java
@@ -104,7 +104,7 @@ class PhyrexianMetamorphEffect extends OneShotEffect {
         Player player = game.getPlayer(source.getControllerId());
         Permanent sourcePermanent = game.getPermanent(source.getSourceId());
         if (player != null && sourcePermanent != null) {
-            Target target = new TargetPermanent(filter);
+            Target target = new TargetPermanent(filter, true);
             if (target.canChoose(source.getControllerId(), game)) {
                 player.choose(Outcome.Copy, target, source.getSourceId(), game);
                 Permanent copyFromPermanent = game.getPermanent(target.getFirstTarget());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java
index dddc9ffcb7e..8e74cce5adf 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/VictoriousDestruction.java
@@ -59,7 +59,7 @@ public class VictoriousDestruction extends CardImpl {
         this.color.setRed(true);
 
         // Destroy target artifact or land. Its controller loses 1 life.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(1));
     }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java
index 4350eb594b8..0eae9908efb 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/VitalSplicer.java
@@ -76,7 +76,7 @@ public class VitalSplicer extends CardImpl {
 
         // {1}: Regenerate target Golem you control.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{1}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Execute.java b/Mage.Sets/src/mage/sets/ninthedition/Execute.java
index 7cdd5c21bf8..cefe44e61c8 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Execute.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Execute.java
@@ -56,7 +56,7 @@ public class Execute extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target white creature. It can't be regenerated.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
         // Draw a card.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java
index b517da06487..1db35aa1800 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Nekrataal.java
@@ -72,7 +72,7 @@ public class Nekrataal extends CardImpl {
 
         // When Nekrataal enters the battlefield, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(true));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
 
     }
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Slay.java b/Mage.Sets/src/mage/sets/ninthedition/Slay.java
index 3558775ba37..5d9fb0f7e65 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Slay.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Slay.java
@@ -56,7 +56,7 @@ public class Slay extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target green creature. It can't be regenerated.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
         // Draw a card.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
diff --git a/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java b/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java
index bfc70a24864..81209c24eb2 100644
--- a/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java
+++ b/Mage.Sets/src/mage/sets/odyssey/DoggedHunter.java
@@ -64,7 +64,7 @@ public class DoggedHunter extends CardImpl {
 
         // {tap}: Destroy target creature token.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java b/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java
index ef3facdb45d..f6702690dbb 100644
--- a/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java
+++ b/Mage.Sets/src/mage/sets/odyssey/GhastlyDemise.java
@@ -62,7 +62,7 @@ public class GhastlyDemise extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new GhastlyDemiseEffect(false));
     }
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java b/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java
index e01a5e788ca..0dad6b47b27 100644
--- a/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java
+++ b/Mage.Sets/src/mage/sets/odyssey/RayOfDistortion.java
@@ -60,7 +60,7 @@ public class RayOfDistortion extends CardImpl {
 
         // Destroy target artifact or enchantment.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         // Flashback {4}{W}{W}
         this.addAbility(new FlashbackAbility(new ManaCostsImpl("{4}{W}{W}"), TimingRule.INSTANT));
     }
diff --git a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java
index 29516ea002e..8c2e203982c 100644
--- a/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java
+++ b/Mage.Sets/src/mage/sets/odyssey/RepentantVampire.java
@@ -83,7 +83,7 @@ public class RepentantVampire extends CardImpl {
                 "<i>Threshold</i> - As long as seven or more cards are in your graveyard, {this} is white",
                 false));
         Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        gainedAbility.addTarget(new TargetCreaturePermanent(filter));
+        gainedAbility.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addEffect(new ConditionalContinousEffect(
                 new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield),
                 new CardsInControllerGraveCondition(7),
diff --git a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java
index 5bb9129be91..e3ecd18b2b8 100644
--- a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java
+++ b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java
@@ -99,7 +99,7 @@ class SparkMageTriggeredAbility extends TriggeredAbilityImpl {
                     FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + opponent.getName() + " controls");
                     filter.add(new ControllerIdPredicate(opponent.getId()));
                     this.getTargets().clear();
-                    this.getTargets().add(new TargetCreaturePermanent(filter));
+                    this.getTargets().add(new TargetCreaturePermanent(filter, true));
                     return true;
                 }
             }
diff --git a/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java b/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java
index 749ca423bc5..e20ed54ce9f 100644
--- a/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java
+++ b/Mage.Sets/src/mage/sets/odyssey/ZombieAssassin.java
@@ -73,7 +73,7 @@ public class ZombieAssassin extends CardImpl {
 
         // {tap}, Exile two cards from your graveyard and Zombie Assassin: Destroy target nonblack creature. It can't be regenerated.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(true), new TapSourceCost());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2,2,new FilterCard("cards from your graveyard"))));
diff --git a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java
index 28b90faee27..bb600f7bd64 100644
--- a/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java
+++ b/Mage.Sets/src/mage/sets/onslaught/CruelRevival.java
@@ -70,7 +70,7 @@ public class CruelRevival extends CardImpl {
 
         // Destroy target non-Zombie creature. It can't be regenerated. Return up to one target Zombie card from your graveyard to your hand.
         this.getSpellAbility().addEffect(new CruelRevivalEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(0, 1, filter2));
     }
 
diff --git a/Mage.Sets/src/mage/sets/onslaught/Swat.java b/Mage.Sets/src/mage/sets/onslaught/Swat.java
index 6725e0879c4..636335f8e3f 100644
--- a/Mage.Sets/src/mage/sets/onslaught/Swat.java
+++ b/Mage.Sets/src/mage/sets/onslaught/Swat.java
@@ -59,7 +59,7 @@ public class Swat extends CardImpl {
 
         // Destroy target creature with power 2 or less.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         // Cycling {2}
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
     }
diff --git a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java
index be1dc8700a9..d0167bd8203 100644
--- a/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java
+++ b/Mage.Sets/src/mage/sets/onslaught/WirewoodLodge.java
@@ -63,7 +63,7 @@ public class WirewoodLodge extends CardImpl {
         // {G}, {T}: Untap target Elf.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{G}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java b/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java
index 1da708fcfe3..b714e1bb60f 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/BigGameHunter.java
@@ -67,7 +67,7 @@ public class BigGameHunter extends CardImpl {
 
         // When Big Game Hunter enters the battlefield, destroy target creature with power 4 or greater. It can't be regenerated.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(true));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         // Madness {B}
         this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{B}")));
diff --git a/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java b/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java
index 34ba3147c28..f5d006b8470 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/HammerheimDeadeye.java
@@ -67,7 +67,7 @@ public class HammerheimDeadeye extends CardImpl {
         this.addAbility(new EchoAbility("{5}{R}"));
         // When Hammerheim Deadeye enters the battlefield, destroy target creature with flying.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java b/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java
index f7020e4f0be..f09d0f987e8 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/PoulticeSliver.java
@@ -70,7 +70,7 @@ public class PoulticeSliver extends CardImpl {
         // All Slivers have "{2}, {tap}: Regenerate target Sliver."
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new GenericManaCost(2));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
 
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new GainAbilityAllEffect(ability,
diff --git a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java
index 638e7731864..24c16d6d570 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/Saltblast.java
@@ -55,7 +55,7 @@ public class Saltblast extends CardImpl {
 
         // Destroy target nonwhite permanent.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Saltblast(final Saltblast card) {
diff --git a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java
index 4c7b61b48ed..8e66df5fffe 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/SealOfPrimordium.java
@@ -64,7 +64,7 @@ public class SealOfPrimordium extends CardImpl {
 
         // Sacrifice Seal of Primordium: Destroy target artifact or enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java
index b9638a89730..d22640ff4c7 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/Stingscourger.java
@@ -67,7 +67,7 @@ public class Stingscourger extends CardImpl {
         this.addAbility(new EchoAbility("{3}{R}"));
         // When Stingscourger enters the battlefield, return target creature an opponent controls to its owner's hand.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect());
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java
index f2b0e416bb6..38a06f694d0 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/Sunlance.java
@@ -57,7 +57,7 @@ public class Sunlance extends CardImpl {
 
         // Sunlance deals 3 damage to target nonwhite creature.
         this.getSpellAbility().addEffect(new DamageTargetEffect(3));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public Sunlance(final Sunlance card) {
diff --git a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java
index 7960e96ce9c..fe1e876cff1 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/NullmageAdvocate.java
@@ -77,7 +77,7 @@ public class NullmageAdvocate extends CardImpl {
         effect.setTargetPointer(new SecondTargetPointer());
         ability.addEffect(effect);
         ability.addTarget(new TargetCardInOpponentsGraveyard(2,2, new FilterCard("two target cards from an opponent's graveyard"), true));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java
index 1876c7401a8..e0787be9ec1 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/QuietDisrepair.java
@@ -70,7 +70,7 @@ public class QuietDisrepair extends CardImpl {
         this.color.setGreen(true);
 
         // Enchant artifact or enchantment
-        TargetPermanent auraTarget = new TargetPermanent(filter);
+        TargetPermanent auraTarget = new TargetPermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/prophecy/Abolish.java b/Mage.Sets/src/mage/sets/prophecy/Abolish.java
index 62c26384a82..04cf90cb309 100644
--- a/Mage.Sets/src/mage/sets/prophecy/Abolish.java
+++ b/Mage.Sets/src/mage/sets/prophecy/Abolish.java
@@ -66,7 +66,7 @@ public class Abolish extends CardImpl {
 
         // Destroy target artifact or enchantment.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Abolish(final Abolish card) {
diff --git a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java
index dd49b7a84f1..1367988f45b 100644
--- a/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java
+++ b/Mage.Sets/src/mage/sets/ravnika/ElvishSkysweeper.java
@@ -70,7 +70,7 @@ public class ElvishSkysweeper extends CardImpl {
         // {4}{G}, Sacrifice a creature: Destroy target creature with flying.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{4}{G}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnika/Putrefy.java b/Mage.Sets/src/mage/sets/ravnika/Putrefy.java
index b14ab7da966..e039bd9e705 100644
--- a/Mage.Sets/src/mage/sets/ravnika/Putrefy.java
+++ b/Mage.Sets/src/mage/sets/ravnika/Putrefy.java
@@ -56,7 +56,7 @@ public class Putrefy extends CardImpl {
         this.expansionSetCode = "RAV";
         this.color.setBlack(true);
         this.color.setGreen(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
     }
 
diff --git a/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java b/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java
index 611d1b5d18c..1a38ec0fec9 100644
--- a/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java
+++ b/Mage.Sets/src/mage/sets/ravnika/SistersOfStoneDeath.java
@@ -83,7 +83,7 @@ public class SistersOfStoneDeath extends CardImpl {
         FilterCreaturePermanent filter = new FilterCreaturePermanent("creature blocking or blocked by Sisters of Stone Death");
         filter.add(Predicates.or(new BlockedByIdPredicate(this.getId()),
                 new BlockingAttackerIdPredicate(this.getId())));
-        ability2.addTarget(new TargetCreaturePermanent(filter));
+        ability2.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability2);
 
         // {2}{B}: Put a creature card exiled with Sisters of Stone Death onto the battlefield under your control.
diff --git a/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java b/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java
index 762ac34699d..48645e6cd10 100644
--- a/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java
+++ b/Mage.Sets/src/mage/sets/ravnika/SunderingVitae.java
@@ -61,7 +61,7 @@ public class SunderingVitae extends CardImpl {
         // Convoke
         this.addAbility(new ConvokeAbility());
         // Destroy target artifact or enchantment.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java
index 3b2f4e65124..13dbbb037dc 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/AerialPredation.java
@@ -58,7 +58,7 @@ public class AerialPredation extends CardImpl {
         this.color.setGreen(true);
         
         // Destroy target creature with flying. You gain 2 life.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new GainLifeEffect(2));
     }
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java
index 55c75fef668..48056e61151 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/AzoriusArrester.java
@@ -65,7 +65,7 @@ public class AzoriusArrester extends CardImpl {
 
         // When Azorius Arrester enters the battlefield, detain target creature an opponent controls.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DetainTargetEffect(), false);
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java
index 96088f18c01..7fe18eede1b 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Blustersquall.java
@@ -65,7 +65,7 @@ public class Blustersquall extends CardImpl {
         this.color.setBlue(true);
 
         // Tap target creature you don't control.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new TapTargetEffect());
 
         // Overload {3}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java
index 4e3613d26e8..59ca94ed757 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/ChemistersTrick.java
@@ -70,7 +70,7 @@ public class ChemistersTrick extends CardImpl {
         this.color.setRed(true);
 
         // Target creature you don't control gets -2/-0 until end of turn and attacks this turn if able.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new BoostTargetEffect(-2,0, Duration.EndOfTurn));
         this.getSpellAbility().addEffect(new AttacksIfAbleTargetEffect(Duration.EndOfTurn));
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java b/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java
index 76fe4a5f3e9..ea2f2a87dc9 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/ConjuredCurrency.java
@@ -63,7 +63,7 @@ public class ConjuredCurrency extends CardImpl {
 
         // At the beginning of your upkeep, you may exchange control of Conjured Currency and target permanent you neither own nor control.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new ExchangeControlTargetEffect(Duration.EndOfGame, rule, true), TargetController.YOU, true);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java b/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java
index ccac70980dd..65e4533e599 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Downsize.java
@@ -61,7 +61,7 @@ public class Downsize extends CardImpl {
         this.color.setBlue(true);
 
         // Target creature you don't control gets -4/-0 until end of turn.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new BoostTargetEffect(-4,0, Duration.EndOfTurn));
 
         // Overload {2}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java
index 483bf060145..ca1f852efe6 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Dreadbore.java
@@ -61,7 +61,7 @@ public class Dreadbore extends CardImpl {
 
         // Destroy target creature or planeswalker.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Dreadbore(final Dreadbore card) {
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java b/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java
index 8183df6d5b9..92b79de9512 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Electrickery.java
@@ -60,7 +60,7 @@ public class Electrickery extends CardImpl {
         this.color.setRed(true);
 
         // Electrickery deals 1 damage to target creature you don't control.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DamageTargetEffect(1));
 
         // Overload {1}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java
index 68ae51a621f..4145b120842 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/InactionInjunction.java
@@ -60,7 +60,7 @@ public class InactionInjunction extends CardImpl {
         // Detain target creature an opponent controls.
         // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.)
         this.getSpellAbility().addEffect(new DetainTargetEffect());
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
         
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java
index 294cc35a1e8..2c561d47ea3 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/IsperiasSkywatch.java
@@ -70,7 +70,7 @@ public class IsperiasSkywatch extends CardImpl {
         // When Isperia's Skywatch enters the battlefield, detain target creature an opponent controls.
         // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.)
         Ability ability = new EntersBattlefieldTriggeredAbility(new DetainTargetEffect());
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java
index 99256513115..3fef5f94aaa 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/KeeningApparition.java
@@ -63,7 +63,7 @@ public class KeeningApparition extends CardImpl {
 
         // Sacrifice Keening Apparition: Destroy target enchantment.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(),new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java
index bdafdf1598b..7f72f8254fb 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/MartialLaw.java
@@ -60,7 +60,7 @@ public class MartialLaw extends CardImpl {
         // At the beginning of your upkeep, detain target creature an opponent controls. 
         // (Until your next turn, that creature can't attack or block and its activated abilities can't be activated.)
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new DetainTargetEffect(), TargetController.YOU, false);
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java
index 6ed8f02bfee..e0be1b922f1 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumMortars.java
@@ -60,7 +60,7 @@ public class MizziumMortars extends CardImpl {
         this.color.setRed(true);
 
         // MizziumMortars deals 4 damage to target creature you don't control.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DamageTargetEffect(4));
 
         // Overload {3}{R}{R}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java
index 5c35f8437da..58b94be520e 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/MizziumSkin.java
@@ -64,7 +64,7 @@ public class MizziumSkin extends CardImpl {
         this.color.setBlue(true);
 
         // Target creature you control gets +0/+1 and gains hexproof until end of turn.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new BoostTargetEffect(0,1, Duration.EndOfTurn));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn));
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java
index 58abb45cae3..d6cc94af359 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/RixMaadiGuildmage.java
@@ -74,7 +74,7 @@ public class RixMaadiGuildmage extends CardImpl {
 
         // {B}{R}: Target blocking creature gets -1/-1 until end of turn.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn),new ManaCostsImpl("{B}{R}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
 
         // {B}{R}: Target player who lost life this turn loses 1 life.
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java
index fc6f1966c18..b8747e5390e 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SelesnyaCharm.java
@@ -71,7 +71,7 @@ public class SelesnyaCharm extends CardImpl {
         // or exile target creature with power 5 or greater;
         Mode mode = new Mode();
         mode.getEffects().add(new ExileTargetEffect());
-        mode.getTargets().add(new TargetCreaturePermanent(filter));
+        mode.getTargets().add(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addMode(mode);
 
         // or put a 2/2 white Knight creature token with vigilance onto the battlefield.
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
index e28e4f8efb0..17cb4242e25 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
@@ -98,7 +98,7 @@ class SkymarkRocAbility extends TriggeredAbilityImpl {
             filter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, 3));
 
             this.getTargets().clear();
-            TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+            TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
             target.setRequired(true);
             this.addTarget(target);
             return true;
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java
index 921b6e8ed76..95e03962fa8 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SoulswornSpirit.java
@@ -69,7 +69,7 @@ public class SoulswornSpirit extends CardImpl {
         // When Soulsworn Spirit enters the battlefield, detain target creature an opponent controls. 
         //(Until your next turn, that creature can't attack or block and its activated abilities can't be activated.)
         Ability ability = new EntersBattlefieldTriggeredAbility(new DetainTargetEffect());
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java
index 1c37c26a9cb..24b5b1905f6 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/StreetSpasm.java
@@ -65,7 +65,7 @@ public class StreetSpasm extends CardImpl {
         this.color.setRed(true);
 
         // Street Spasm deals X damage to target creature without flying you don't control.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue()));
 
         // Overload {X}{X}{R}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java
index 8f778c7c43b..52d58b53334 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SunderingGrowth.java
@@ -61,7 +61,7 @@ public class SunderingGrowth extends CardImpl {
 
         // Destroy target artifact or enchantment, then populate.
         // (Put a token onto the battlefield that's a copy of a creature token you control.)
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new PopulateEffect("then"));
     }
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java
index 08208f449cb..8188c21c729 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/UltimatePrice.java
@@ -56,7 +56,7 @@ public class UltimatePrice extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target monocolored creature.
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java
index 40ad6f65868..b0ebea87913 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AuraFinesse.java
@@ -65,7 +65,7 @@ public class AuraFinesse extends CardImpl {
 
         // Attach target Aura you control to target creature.
         this.getSpellAbility().addEffect(new AuraFinesseEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(true));
         // Draw a card.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java
index 34c765c0e29..afb5b2e7339 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BalaGedScorpion.java
@@ -61,7 +61,7 @@ public class BalaGedScorpion extends CardImpl {
         this.toughness = new MageInt(3);
 
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
 
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java
index 5fb3d7ab18e..a2ae4c727f8 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Corpsehatch.java
@@ -58,7 +58,7 @@ public class Corpsehatch extends CardImpl {
 
         this.color.setBlack(true);
 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new CreateTokenEffect(new EldraziSpawnToken(), 2));
     }
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java
index a2c0664646f..591d1404315 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GideonJura.java
@@ -76,7 +76,7 @@ public class GideonJura extends CardImpl {
         this.addAbility(ability1);
 
         LoyaltyAbility ability2 = new LoyaltyAbility(new DestroyTargetEffect(), -2);
-        ability2.addTarget(new TargetCreaturePermanent(filter));
+        ability2.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability2);
 
         LoyaltyAbility ability3 = new LoyaltyAbility(new BecomesCreatureSourceEffect(new GideonJuraToken(), "planeswalker", Duration.EndOfTurn), 0);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java
index f118ff9b576..a857dc7985b 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GoblinTunneler.java
@@ -66,7 +66,7 @@ public class GoblinTunneler extends CardImpl {
 
         // {tap}: Target creature with power 2 or less is unblockable this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java
index 4da2f2d170b..bffe6a295bb 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GrotagSiegeRunner.java
@@ -73,7 +73,7 @@ public class GrotagSiegeRunner extends CardImpl {
         // {R}, Sacrifice Grotag Siege-Runner: Destroy target creature with defender. Grotag Siege-Runner deals 2 damage to that creature's controller.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{R}"));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addEffect(new GrotageSiegeRunnerEffect());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java
index d6a3edc3d97..0de283e4efd 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/JaddiLifestrider.java
@@ -97,7 +97,7 @@ class JaddiLifestriderEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         int tappedAmount = 0;
         Player you = game.getPlayer(source.getControllerId());
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         while (true) {
             target.clearChosen();
             if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Tap, source.getControllerId(), source.getSourceId(), game)) {
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java
index e94f046638f..8705ec36917 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KorLineSlinger.java
@@ -65,7 +65,7 @@ public class KorLineSlinger extends CardImpl {
         this.toughness = new MageInt(1);
 
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java
index 4eb12335331..238ac3f3905 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LeafArrow.java
@@ -55,7 +55,7 @@ public class LeafArrow extends CardImpl {
 
         this.color.setGreen(true);
 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DamageTargetEffect(3));
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java
index 1a0e389c0b7..fb9beb952dc 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Narcolepsy.java
@@ -61,7 +61,7 @@ public class Narcolepsy extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant creature
-        TargetPermanent auraTarget = new TargetPermanent(filter);
+        TargetPermanent auraTarget = new TargetPermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         EnchantAbility ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java
index 1a59af03f60..afa51ac6b7d 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PuncturingLight.java
@@ -56,7 +56,7 @@ public class PuncturingLight extends CardImpl {
 
         this.color.setWhite(true);
 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java
index ec38b2c83e2..439df00b48c 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Smite.java
@@ -55,7 +55,7 @@ public class Smite extends CardImpl {
         this.color.setWhite(true);
 
         // Destroy target blocked creature.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(false));
     }
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java
index f94f9103b69..4f0a48811a7 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vendetta.java
@@ -65,7 +65,7 @@ public class Vendetta extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target nonblack creature. It can't be regenerated. You lose life equal to that creature's toughness.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
         this.getSpellAbility().addEffect(new VendettaEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java
index 70cd862795b..b718bfa28d3 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/CutTheEarthlyBond.java
@@ -57,7 +57,7 @@ public class CutTheEarthlyBond extends CardImpl {
 
         // Return target enchanted permanent to its owner's hand.
         this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
 
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java
index a8c5ccbfd66..08ece15cfac 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/GodosIrregulars.java
@@ -79,7 +79,7 @@ public class GodosIrregulars extends CardImpl {
             ability.getTargets().clear();
             FilterCreaturePermanent filter = basicFilter.copy();
             filter.add(new BlockingAttackerIdPredicate(this.getId()));
-            Target target = new TargetCreaturePermanent(filter);
+            Target target = new TargetCreaturePermanent(filter, true);
             ability.addTarget(target);
         }
     }
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java
index 4a7a259d4ad..89f7f46129b 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/ManrikiGusari.java
@@ -63,7 +63,7 @@ public class ManrikiGusari extends CardImpl {
         // Equipped creature gets +1/+2 and has "{tap}: Destroy target Equipment."
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 2)));
         Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        gainedAbility.addTarget(new TargetPermanent(filter));
+        gainedAbility.addTarget(new TargetPermanent(filter, true));
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(gainedAbility, AttachmentType.EQUIPMENT)));
         // Equip {1}
         this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1)));
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java
index 02a5eea4e7f..12368039db3 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SkyfireKirin.java
@@ -87,7 +87,7 @@ public class SkyfireKirin extends CardImpl {
                 int cmc = spell.getManaCost().convertedManaCost();
                 ability.getTargets().clear();
                 FilterPermanent filter = new FilterCreaturePermanent(new StringBuilder("creature with converted mana costs of ").append(cmc).toString());
-                Target target = new TargetPermanent(filter);
+                Target target = new TargetPermanent(filter, true);
                 ability.addTarget(target);
             }
         }
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java
index 06cee3937f2..c3bdfce3854 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/SunderFromWithin.java
@@ -58,7 +58,7 @@ public class SunderFromWithin extends CardImpl {
         this.color.setRed(true);
         // Destroy target artifact or land.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public SunderFromWithin(final SunderFromWithin card) {
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java
index 749b94a58ca..b4571139855 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AbunaAcolyte.java
@@ -67,7 +67,7 @@ public class AbunaAcolyte extends CardImpl {
         Ability ability1 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 1), new TapSourceCost());
         ability1.addTarget(new TargetCreatureOrPlayer());
         Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 2), new TapSourceCost());
-        ability2.addTarget(new TargetCreaturePermanent(filter));
+        ability2.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability1);
         this.addAbility(ability2);
     }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java
index d07735510f9..6e019a88a2d 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/AcidWebSpider.java
@@ -61,7 +61,7 @@ public class AcidWebSpider extends CardImpl {
         this.toughness = new MageInt(5);
         this.addAbility(ReachAbility.getInstance());
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), true);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java
index 20aeb333441..b406bdcc67e 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemArtisan.java
@@ -76,13 +76,13 @@ public class GolemArtisan extends CardImpl {
 
         // {2}: Target artifact creature gets +1/+1 until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new GenericManaCost(2));
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         ability.addTarget(target);
         this.addAbility(ability);
 
         // {2}: Target artifact creature gains your choice of flying, trample, or haste until end of turn.
         ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GolemArtisanEffect(), new GenericManaCost(2));
-        target = new TargetPermanent(filter);
+        target = new TargetPermanent(filter, true);
         ability.addTarget(target);
         this.addAbility(ability);
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java
index fd29f64e36b..1ab40b824bf 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HoardSmelterDragon.java
@@ -66,7 +66,7 @@ public class HoardSmelterDragon extends CardImpl {
         this.toughness = new MageInt(5);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{3}{R}"));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         ability.addEffect(new HoardSmelterEffect());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java
index cb8469e83f5..1bec01c4423 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OxiddaScrapmelter.java
@@ -57,7 +57,7 @@ public class OxiddaScrapmelter extends CardImpl {
         this.toughness = new MageInt(3);
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java
index 1f38da01b1f..457ef8e4712 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RevokeExistence.java
@@ -57,7 +57,7 @@ public class RevokeExistence extends CardImpl {
         this.expansionSetCode = "SOM";
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new ExileTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public RevokeExistence (final RevokeExistence card) {
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java
index 35999caa07c..1e7f0d6a462 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ShapeAnew.java
@@ -65,7 +65,7 @@ public class ShapeAnew extends CardImpl {
         this.expansionSetCode = "SOM";
         this.color.setBlue(true);
         this.getSpellAbility().addEffect(new SacrificeTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new ShapeAnewEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java
index 1621a2e4603..5f6b61658ce 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SliceinTwain.java
@@ -58,7 +58,7 @@ public class SliceinTwain extends CardImpl {
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public SliceinTwain (final SliceinTwain card) {
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java
index d4f6062842b..64e110b363b 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SylvokReplica.java
@@ -65,7 +65,7 @@ public class SylvokReplica extends CardImpl {
         this.toughness = new MageInt(3);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G}"));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java
index c79b9f0e22a..7b312062243 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TumbleMagnet.java
@@ -65,7 +65,7 @@ public class TumbleMagnet extends CardImpl {
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.CHARGE.createInstance(3)), "Tumble Magnet enters the battlefield with three charge counters on it"));
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost());
         ability.addCost(new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java
index 20f5845848a..89d25f038e2 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/WingPuncture.java
@@ -62,7 +62,7 @@ public class WingPuncture extends CardImpl {
         this.color.setGreen(true);
 
         this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new WingPunctureEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java
index c1e56d99009..d72aa0e8aaf 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Pillage.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Pillage.java
@@ -60,7 +60,7 @@ public class Pillage extends CardImpl {
 
         // Destroy target artifact or land. It can't be regenerated.
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Pillage(final Pillage card) {
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java b/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java
index 371dcd9d491..55d102b8ae4 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Reprisal.java
@@ -57,7 +57,7 @@ public class Reprisal extends CardImpl {
 
         // Destroy target creature with power 4 or greater. It can't be regenerated.
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public Reprisal(final Reprisal card) {
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java
index 530b3082f71..c25d515fe38 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Vengeance.java
@@ -54,7 +54,7 @@ public class Vengeance extends CardImpl {
         this.color.setWhite(true);
 
         // Destroy target tapped creature.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java b/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java
index ab2fc0fe3da..3b9fa4da123 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/BoggartArsonists.java
@@ -74,7 +74,7 @@ public class BoggartArsonists extends CardImpl {
         // {2}{R}, Sacrifice Boggart Arsonists: Destroy target Scarecrow or Plains.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{R}"));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
 
     }
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java b/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java
index 0b72fab24d6..d3acb7c4912 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/ElvishHexhunter.java
@@ -70,7 +70,7 @@ public class ElvishHexhunter extends CardImpl {
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{G/W}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java
index 294bbd5af18..60a6ad3a175 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/KithkinShielddare.java
@@ -65,7 +65,7 @@ public class KithkinShielddare extends CardImpl {
                 new BoostTargetEffect(2, 2, Duration.EndOfTurn),
                 new ManaCostsImpl("{W}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java b/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java
index 44b35e55ff0..e25f4b55b5f 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/LastBreath.java
@@ -64,7 +64,7 @@ public class LastBreath extends CardImpl {
         // Exile target creature with power 2 or less. Its controller gains 4 life.
         this.getSpellAbility().addEffect(new ExileTargetEffect());
         this.getSpellAbility().addEffect(new LastBreathEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
 
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java
index 110c1ede2d0..0aa5c5d83b2 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/SootstokeKindler.java
@@ -74,7 +74,7 @@ public class SootstokeKindler extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn),
                 new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java
index 19d4e333675..c220144a7a5 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/WoodfallPrimus.java
@@ -67,7 +67,7 @@ public class WoodfallPrimus extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
         // When Woodfall Primus enters the battlefield, destroy target noncreature permanent.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
         // Persist
         this.addAbility(new PersistAbility());
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java
index 09c628a97c6..9aeb2323c3d 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/BloodthornTaunter.java
@@ -69,7 +69,7 @@ public class BloodthornTaunter extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn),
                 new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java
index f9079929fc8..8826e441388 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/ComaVeil.java
@@ -62,7 +62,7 @@ public class ComaVeil extends CardImpl {
         this.color.setBlue(true);
 
         // Enchant artifact or creature
-        TargetPermanent auraTarget = new TargetPermanent(filter);
+        TargetPermanent auraTarget = new TargetPermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         // Enchanted permanent doesn't untap during its controller's untap step.
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java
index e2b04830231..c1b9e54bead 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/DispellersCapsule.java
@@ -63,7 +63,7 @@ public class DispellersCapsule extends CardImpl {
         this.color.setWhite(true);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{W}"));
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java
index 223a686eb24..f3db4719d26 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/EsperCharm.java
@@ -62,7 +62,7 @@ public class EsperCharm extends CardImpl {
 
         // Choose one - Destroy target enchantment;
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         // or draw two cards;
         Mode mode = new Mode();
         mode.getEffects().add(new DrawCardSourceControllerEffect(2));
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java
index 84f63a733d2..65c47240765 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/ExecutionersCapsule.java
@@ -64,7 +64,7 @@ public class ExecutionersCapsule extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java
index e9185add12e..d67160188fd 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Fatestitcher.java
@@ -67,7 +67,7 @@ public class Fatestitcher extends CardImpl {
 
         // {tap}: You may tap or untap another target permanent.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MayTapOrUntapTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
         // Unearth {U}
         this.addAbility(new UnearthAbility(new ManaCostsImpl("{U}")));
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java
index 2eb343337f4..17989ade3fe 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/FiligreeSages.java
@@ -62,7 +62,7 @@ public class FiligreeSages extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{2}{U}"));
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java
index 354a5aa8d03..3122e30e7c5 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Godtoucher.java
@@ -72,7 +72,7 @@ public class Godtoucher extends CardImpl {
                 new GodtoucherEffect(Duration.EndOfTurn),
                 new ManaCostsImpl("{1}{W}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java
index bac39002c30..63190298ad2 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Mosstodon.java
@@ -68,7 +68,7 @@ public class Mosstodon extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),
                 new ManaCostsImpl("{1}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java
index 5785b55b061..70723037b0c 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/RakeclawGargantuan.java
@@ -69,7 +69,7 @@ public class RakeclawGargantuan extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn),
                 new ManaCostsImpl("{1}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java
index f741b80c28d..7112b39e34a 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/SpearbreakerBehemoth.java
@@ -70,7 +70,7 @@ public class SpearbreakerBehemoth extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn),
                 new ManaCostsImpl("{1}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java
index f06170b6ff6..a4a82e2ff6f 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/VolcanicSubmersion.java
@@ -61,7 +61,7 @@ public class VolcanicSubmersion extends CardImpl {
 
         // Destroy target artifact or land.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         // Cycling {2}
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
     }
diff --git a/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java b/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java
index 19ff73995dd..9616edf22fe 100644
--- a/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java
+++ b/Mage.Sets/src/mage/sets/stronghold/StrongholdAssassin.java
@@ -71,7 +71,7 @@ public class StrongholdAssassin extends CardImpl {
         // {tap}, Sacrifice a creature: Destroy target nonblack creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1, new FilterControlledCreaturePermanent("a creature"), true)));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/tempest/Aftershock.java b/Mage.Sets/src/mage/sets/tempest/Aftershock.java
index 7d2610124c4..8663f9359f9 100644
--- a/Mage.Sets/src/mage/sets/tempest/Aftershock.java
+++ b/Mage.Sets/src/mage/sets/tempest/Aftershock.java
@@ -58,7 +58,7 @@ public class Aftershock extends CardImpl {
         this.expansionSetCode = "TMP";
         this.color.setRed(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DamageControllerEffect(3));
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java
index 540a2edf9b0..7358b2efe62 100644
--- a/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java
+++ b/Mage.Sets/src/mage/sets/tempest/CloudchaserEagle.java
@@ -61,7 +61,7 @@ public class CloudchaserEagle extends CardImpl {
         this.toughness = new MageInt(2);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java
index 24ecf687f18..073c5d65968 100644
--- a/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java
+++ b/Mage.Sets/src/mage/sets/tempest/DarkBanishing.java
@@ -55,7 +55,7 @@ public class DarkBanishing extends CardImpl {
         this.expansionSetCode = "TMP";
         this.color.setBlack(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public DarkBanishing(final DarkBanishing card) {
diff --git a/Mage.Sets/src/mage/sets/tempest/Disenchant.java b/Mage.Sets/src/mage/sets/tempest/Disenchant.java
index 481e83eceb1..97c2e2c5e26 100644
--- a/Mage.Sets/src/mage/sets/tempest/Disenchant.java
+++ b/Mage.Sets/src/mage/sets/tempest/Disenchant.java
@@ -56,7 +56,7 @@ public class Disenchant extends CardImpl {
         this.expansionSetCode = "TMP";
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Disenchant(final Disenchant card) {
diff --git a/Mage.Sets/src/mage/sets/tempest/Gallantry.java b/Mage.Sets/src/mage/sets/tempest/Gallantry.java
index bb08d182bf1..ca6164b6be4 100644
--- a/Mage.Sets/src/mage/sets/tempest/Gallantry.java
+++ b/Mage.Sets/src/mage/sets/tempest/Gallantry.java
@@ -54,7 +54,7 @@ public class Gallantry extends CardImpl {
 
         // Target blocking creature gets +4/+4 until end of turn.
         this.getSpellAbility().addEffect(new BoostTargetEffect(4, 4, Duration.EndOfTurn));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         // Draw a card.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
     }
diff --git a/Mage.Sets/src/mage/sets/tempest/Opportunist.java b/Mage.Sets/src/mage/sets/tempest/Opportunist.java
index 21a6ee7263e..e0998ff5d00 100644
--- a/Mage.Sets/src/mage/sets/tempest/Opportunist.java
+++ b/Mage.Sets/src/mage/sets/tempest/Opportunist.java
@@ -65,7 +65,7 @@ public class Opportunist extends CardImpl {
 
         // {T}: Opportunist deals 1 damage to target creature that was dealt damage this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tempest/Verdigris.java b/Mage.Sets/src/mage/sets/tempest/Verdigris.java
index 9fc36c87520..b74933b691d 100644
--- a/Mage.Sets/src/mage/sets/tempest/Verdigris.java
+++ b/Mage.Sets/src/mage/sets/tempest/Verdigris.java
@@ -53,7 +53,7 @@ public class Verdigris extends CardImpl {
         this.expansionSetCode = "TMP";
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Verdigris(final Verdigris card) {
diff --git a/Mage.Sets/src/mage/sets/tenth/Assassinate.java b/Mage.Sets/src/mage/sets/tenth/Assassinate.java
index ff692077901..a653be428d6 100644
--- a/Mage.Sets/src/mage/sets/tenth/Assassinate.java
+++ b/Mage.Sets/src/mage/sets/tenth/Assassinate.java
@@ -53,7 +53,7 @@ public class Assassinate extends CardImpl {
         super(ownerId, 128, "Assassinate", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{2}{B}");
         this.expansionSetCode = "10E";
         this.color.setBlack(true);
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
 
     }
diff --git a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java
index 04276b8479f..915dfda88fc 100644
--- a/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java
+++ b/Mage.Sets/src/mage/sets/tenth/AvenCloudchaser.java
@@ -62,7 +62,7 @@ public class AvenCloudchaser extends CardImpl {
         this.toughness = new MageInt(2);
         this.addAbility(FlyingAbility.getInstance());
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java
index dee744ba2c2..6d731312165 100644
--- a/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java
+++ b/Mage.Sets/src/mage/sets/tenth/CraftyPathmage.java
@@ -66,7 +66,7 @@ public class CraftyPathmage extends CardImpl {
 
         // {tap}: Target creature with power 2 or less is unblockable this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UnblockableTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java
index 302e0f65336..93948d5cc12 100644
--- a/Mage.Sets/src/mage/sets/tenth/CreepingMold.java
+++ b/Mage.Sets/src/mage/sets/tenth/CreepingMold.java
@@ -57,7 +57,7 @@ public class CreepingMold extends CardImpl {
         this.expansionSetCode = "10E";
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public CreepingMold(final CreepingMold card) {
diff --git a/Mage.Sets/src/mage/sets/tenth/Deathmark.java b/Mage.Sets/src/mage/sets/tenth/Deathmark.java
index eb2cca86238..ecd9445ad2f 100644
--- a/Mage.Sets/src/mage/sets/tenth/Deathmark.java
+++ b/Mage.Sets/src/mage/sets/tenth/Deathmark.java
@@ -57,7 +57,7 @@ public class Deathmark extends CardImpl {
         super(ownerId, 134, "Deathmark", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{B}");
         this.expansionSetCode = "10E";
         this.color.setBlack(true);
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/Demolish.java b/Mage.Sets/src/mage/sets/tenth/Demolish.java
index f3b95c03bba..3f01e0163ff 100644
--- a/Mage.Sets/src/mage/sets/tenth/Demolish.java
+++ b/Mage.Sets/src/mage/sets/tenth/Demolish.java
@@ -56,7 +56,7 @@ public class Demolish extends CardImpl {
         super(ownerId, 196, "Demolish", Rarity.COMMON, new CardType[]{CardType.SORCERY}, "{3}{R}");
         this.expansionSetCode = "10E";
         this.color.setRed(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/Demystify.java b/Mage.Sets/src/mage/sets/tenth/Demystify.java
index 5e9131a2fe2..b18b2aa78bc 100644
--- a/Mage.Sets/src/mage/sets/tenth/Demystify.java
+++ b/Mage.Sets/src/mage/sets/tenth/Demystify.java
@@ -54,7 +54,7 @@ public class Demystify extends CardImpl {
         this.expansionSetCode = "10E";
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Demystify (final Demystify card) {
diff --git a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java
index 56d59ef098d..7201ee5a9fa 100644
--- a/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java
+++ b/Mage.Sets/src/mage/sets/tenth/FemerefArchers.java
@@ -64,7 +64,7 @@ public class FemerefArchers extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(4), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java
index 108da879950..918d2566ecb 100644
--- a/Mage.Sets/src/mage/sets/tenth/HateWeaver.java
+++ b/Mage.Sets/src/mage/sets/tenth/HateWeaver.java
@@ -68,7 +68,7 @@ public class HateWeaver extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 0, Duration.EndOfTurn), new GenericManaCost(2));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java
index 6e741a0b7a2..15fd354cede 100644
--- a/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java
+++ b/Mage.Sets/src/mage/sets/tenth/IcyManipulator.java
@@ -63,7 +63,7 @@ public class IcyManipulator extends CardImpl {
         this.expansionSetCode = "10E";
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java
index 7c9aa3e8a4e..4a0c8524abd 100644
--- a/Mage.Sets/src/mage/sets/tenth/MightWeaver.java
+++ b/Mage.Sets/src/mage/sets/tenth/MightWeaver.java
@@ -69,7 +69,7 @@ public class MightWeaver extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(TrampleAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/Naturalize.java b/Mage.Sets/src/mage/sets/tenth/Naturalize.java
index 87752d73349..63a49b771cb 100644
--- a/Mage.Sets/src/mage/sets/tenth/Naturalize.java
+++ b/Mage.Sets/src/mage/sets/tenth/Naturalize.java
@@ -56,7 +56,7 @@ public class Naturalize extends CardImpl {
         super(ownerId, 282, "Naturalize", Rarity.COMMON, new CardType[]{CardType.INSTANT},"{1}{G}");
         this.expansionSetCode = "10E";
         this.color.setGreen(true);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/Quicksand.java b/Mage.Sets/src/mage/sets/tenth/Quicksand.java
index a72e0765eb8..5105f1cdbd4 100644
--- a/Mage.Sets/src/mage/sets/tenth/Quicksand.java
+++ b/Mage.Sets/src/mage/sets/tenth/Quicksand.java
@@ -64,7 +64,7 @@ public class Quicksand extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new BoostTargetEffect(-1, -2, Duration.EndOfTurn),
                 new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java
index 12d25c529d7..35d61b585f6 100644
--- a/Mage.Sets/src/mage/sets/tenth/RageWeaver.java
+++ b/Mage.Sets/src/mage/sets/tenth/RageWeaver.java
@@ -69,7 +69,7 @@ public class RageWeaver extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/Righteousness.java b/Mage.Sets/src/mage/sets/tenth/Righteousness.java
index 6b5133ec578..57e45667b89 100644
--- a/Mage.Sets/src/mage/sets/tenth/Righteousness.java
+++ b/Mage.Sets/src/mage/sets/tenth/Righteousness.java
@@ -52,7 +52,7 @@ public class Righteousness extends CardImpl {
         this.color.setWhite(true);
 
         this.getSpellAbility().addEffect(new BoostTargetEffect(7, 7, Duration.EndOfTurn));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public Righteousness(final Righteousness card) {
diff --git a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java
index a262dabe26c..8c96a961006 100644
--- a/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java
+++ b/Mage.Sets/src/mage/sets/tenth/RoyalAssassin.java
@@ -64,7 +64,7 @@ public class RoyalAssassin extends CardImpl {
         this.toughness = new MageInt(1);
 
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java
index 3cbbcea4939..1b8fbed6047 100644
--- a/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java
+++ b/Mage.Sets/src/mage/sets/tenth/SkyWeaver.java
@@ -69,7 +69,7 @@ public class SkyWeaver extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new GenericManaCost(2));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java
index d64f61bd4c0..3d1074752dd 100644
--- a/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java
+++ b/Mage.Sets/src/mage/sets/tenth/SpiritWeaver.java
@@ -68,7 +68,7 @@ public class SpiritWeaver extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 1, Duration.EndOfTurn), new GenericManaCost(2));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/Terror.java b/Mage.Sets/src/mage/sets/tenth/Terror.java
index 3ccf4eb8d87..b31077edf3a 100644
--- a/Mage.Sets/src/mage/sets/tenth/Terror.java
+++ b/Mage.Sets/src/mage/sets/tenth/Terror.java
@@ -59,7 +59,7 @@ public class Terror extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target nonartifact, nonblack creature. It can't be regenerated.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
     }
 
diff --git a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java
index 28e201812b3..fea128a42f5 100644
--- a/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java
+++ b/Mage.Sets/src/mage/sets/tenth/ViridianShaman.java
@@ -60,7 +60,7 @@ public class ViridianShaman extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java b/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java
index 0b0cbd48622..b3b23392336 100644
--- a/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java
+++ b/Mage.Sets/src/mage/sets/thedark/GoblinDiggingTeam.java
@@ -65,7 +65,7 @@ public class GoblinDiggingTeam extends CardImpl {
         // {tap}, Sacrifice Goblin Digging Team: Destroy target Wall.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/ArborColossus.java b/Mage.Sets/src/mage/sets/theros/ArborColossus.java
index 9b3cf991c4c..a3ee3330d2f 100644
--- a/Mage.Sets/src/mage/sets/theros/ArborColossus.java
+++ b/Mage.Sets/src/mage/sets/theros/ArborColossus.java
@@ -72,7 +72,7 @@ public class ArborColossus extends CardImpl {
         this.addAbility(new MonstrosityAbility("{3}{G}{G}{G}", 3));
         // When Arbor Colossus becomes monstrous, destroy target creature with flying an opponent controls.
         Ability ability = new BecomesMonstrousSourceTriggeredAbility(new DestroyTargetEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java b/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java
index 4b9651640d7..70f15bae2c4 100644
--- a/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java
+++ b/Mage.Sets/src/mage/sets/theros/ArenaAthlete.java
@@ -64,7 +64,7 @@ public class ArenaAthlete extends CardImpl {
 
         // <i>Heroic</i>  Whenever you cast a spell that targets Arena Athlete, target creature an opponent controls can't block this turn.
         Ability ability = new HeroicAbility(new CantBlockTargetEffect(Duration.EndOfTurn));
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java
index d7332ff7009..55b529ab5de 100644
--- a/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java
+++ b/Mage.Sets/src/mage/sets/theros/ArtisansSorrow.java
@@ -57,7 +57,7 @@ public class ArtisansSorrow extends CardImpl {
 
         // Destroy target artifact or enchantment. Scry 2.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new ScryEffect(2));
     }
 
diff --git a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java
index a5d32299b34..13687989928 100644
--- a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java
+++ b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java
@@ -103,7 +103,7 @@ public class ChainedToTheRocks extends CardImpl {
         this.color.setWhite(true);
 
         // Enchant Mountain you control
-        TargetPermanent auraTarget = new TargetPermanent(filter);
+        TargetPermanent auraTarget = new TargetPermanent(filter, true);
         this.getSpellAbility().addTarget(auraTarget);
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Exile));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
diff --git a/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java b/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java
index b58ecf9a45a..26fa97cbada 100644
--- a/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java
+++ b/Mage.Sets/src/mage/sets/theros/DarkBetrayal.java
@@ -57,7 +57,7 @@ public class DarkBetrayal extends CardImpl {
 
         // Destroy target black creature.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java b/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java
index 6e9aa03b311..e9e1287de42 100644
--- a/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java
+++ b/Mage.Sets/src/mage/sets/theros/DestructiveRevelry.java
@@ -63,7 +63,7 @@ public class DestructiveRevelry extends CardImpl {
 
         // Destroy target artifact or enchantment. Destructive Revelry deals 2 damage to that permanent's controller.
         this.getSpellAbility().addEffect(new DestructiveRevelryEffect());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/theros/EpharasWarden.java b/Mage.Sets/src/mage/sets/theros/EpharasWarden.java
index 4abc0757b78..cc3723d5836 100644
--- a/Mage.Sets/src/mage/sets/theros/EpharasWarden.java
+++ b/Mage.Sets/src/mage/sets/theros/EpharasWarden.java
@@ -66,7 +66,7 @@ public class EpharasWarden extends CardImpl {
 
         // {T}: Tap target creature with power 3 or less.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java b/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java
index 5e9fc40cc5e..ce887f30b3a 100644
--- a/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java
+++ b/Mage.Sets/src/mage/sets/theros/FadeIntoAntiquity.java
@@ -57,7 +57,7 @@ public class FadeIntoAntiquity extends CardImpl {
 
         // Exile target artifact or enchantment.
         this.getSpellAbility().addEffect(new ExileTargetEffect());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java b/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java
index 75e1618b81a..978478dd922 100644
--- a/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java
+++ b/Mage.Sets/src/mage/sets/theros/GlareOfHeresy.java
@@ -56,7 +56,7 @@ public class GlareOfHeresy extends CardImpl {
 
         // Exile target white permanent.
         this.getSpellAbility().addEffect(new ExileTargetEffect());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java b/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java
index c2244ab1e46..b073fdb3bcc 100644
--- a/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java
+++ b/Mage.Sets/src/mage/sets/theros/HeliodsEmissary.java
@@ -72,12 +72,12 @@ public class HeliodsEmissary extends CardImpl {
         this.addAbility(new BestowAbility(this, "{6}{W}"));
         // Whenever Heliod's Emissary or enchanted creature attacks, tap target creature an opponent controls.
         Ability ability = new AttacksTriggeredAbility(new TapTargetEffect(), false);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
         ability = new AttacksAttachedTriggeredAbility(new TapTargetEffect(), AttachmentType.AURA, false);
-        target = new TargetCreaturePermanent(filter);
+        target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/HerosDownfall.java b/Mage.Sets/src/mage/sets/theros/HerosDownfall.java
index 1a061e3e8a1..e4cd5e9e186 100644
--- a/Mage.Sets/src/mage/sets/theros/HerosDownfall.java
+++ b/Mage.Sets/src/mage/sets/theros/HerosDownfall.java
@@ -57,7 +57,7 @@ public class HerosDownfall extends CardImpl {
 
         // Destroy target creature or planeswalker.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java b/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java
index 1dbf204078e..3039cd3677f 100644
--- a/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java
+++ b/Mage.Sets/src/mage/sets/theros/KeepsakeGorgon.java
@@ -72,7 +72,7 @@ public class KeepsakeGorgon extends CardImpl {
         this.addAbility(new MonstrosityAbility("{5}{B}{B}", 1));
         // When Keepsake Gorgon becomes monstrous, destroy target non-Gorgon creature an opponent controls.
         Ability ability = new BecomesMonstrousSourceTriggeredAbility(new DestroyTargetEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java b/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java
index 5b738114720..5618f5262b7 100644
--- a/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java
+++ b/Mage.Sets/src/mage/sets/theros/LoathsomeCatoblepas.java
@@ -70,7 +70,7 @@ public class LoathsomeCatoblepas extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MustBeBlockedByAtLeastOneSourceEffect(), new ManaCostsImpl("{2}{G}")));
         // When Loathsome Catoblepas dies, target creature an opponent controls gets -3/-3 until end of turn.
         Ability ability = new DiesTriggeredAbility(new BoostTargetEffect(-3,-3, Duration.EndOfTurn), false);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java b/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java
index 4973b6f4229..efcc201516e 100644
--- a/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java
+++ b/Mage.Sets/src/mage/sets/theros/ShipwreckSinger.java
@@ -75,7 +75,7 @@ public class ShipwreckSinger extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // {1}{U}: Target creature an opponent controls attacks this turn if able.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AttacksIfAbleTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{1}{U}"));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java b/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java
index 3b0337b3c26..2e02b92857b 100644
--- a/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java
+++ b/Mage.Sets/src/mage/sets/theros/ShreddingWinds.java
@@ -57,7 +57,7 @@ public class ShreddingWinds extends CardImpl {
 
         // Shredding Winds deals 7 damage to target creature with flying.
         this.getSpellAbility().addEffect(new DamageTargetEffect(7));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
     }
diff --git a/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java b/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java
index 7602d682c07..aaa7efeb23d 100644
--- a/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java
+++ b/Mage.Sets/src/mage/sets/theros/SpearOfHeliod.java
@@ -69,7 +69,7 @@ public class SpearOfHeliod extends CardImpl {
         // {1}{W}{W}, {T}: Destroy target creature that dealt damage to you this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{1}{W}{W}"));
         ability.addCost(new TapSourceCost());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/TriadOfFates.java b/Mage.Sets/src/mage/sets/theros/TriadOfFates.java
index bfdb6985461..e74dff8357d 100644
--- a/Mage.Sets/src/mage/sets/theros/TriadOfFates.java
+++ b/Mage.Sets/src/mage/sets/theros/TriadOfFates.java
@@ -81,7 +81,7 @@ public class TriadOfFates extends CardImpl {
         // {1}, {T}: Put a fate counter on another target creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.FATE.createInstance()), new ManaCostsImpl("{1}"));
         ability.addCost(new TapSourceCost());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java
index 37bf7d80141..734302f2406 100644
--- a/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java
+++ b/Mage.Sets/src/mage/sets/theros/VanquishTheFoul.java
@@ -58,7 +58,7 @@ public class VanquishTheFoul extends CardImpl {
 
         // Destroy target creature with power 4 or greater. Scry 1.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         this.getSpellAbility().addTarget(target);
         this.getSpellAbility().addEffect(new ScryEffect(1));
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Desert.java b/Mage.Sets/src/mage/sets/timeshifted/Desert.java
index 4c553750491..517dd4fa838 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Desert.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Desert.java
@@ -65,7 +65,7 @@ public class Desert extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
         // {tap}: Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step.
         Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost(), IsEndOfCombatStep.getInstance(), null);
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java b/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java
index b4afdac0edc..a6f9d9cde8e 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/Pendelhaven.java
@@ -66,7 +66,7 @@ public class Pendelhaven extends CardImpl {
         this.addAbility(new GreenManaAbility());
         // {tap}: Target 1/1 creature gets +1/+2 until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 2, Duration.EndOfTurn), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java
index 7ad81cdd262..fa363d1710a 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/ZhalfirinCommander.java
@@ -70,7 +70,7 @@ public class ZhalfirinCommander extends CardImpl {
         this.addAbility(new FlankingAbility());
         // {1}{W}{W}: Target Knight creature gets +1/+1 until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}{W}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java
index cec87765fcf..9e658c7f3ba 100644
--- a/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java
+++ b/Mage.Sets/src/mage/sets/timespiral/DarkWithering.java
@@ -60,7 +60,7 @@ public class DarkWithering extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target nonblack creature.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
 
         // Madness {B}
diff --git a/Mage.Sets/src/mage/sets/timespiral/GroundRift.java b/Mage.Sets/src/mage/sets/timespiral/GroundRift.java
index 868450ad016..704f69a8a6b 100644
--- a/Mage.Sets/src/mage/sets/timespiral/GroundRift.java
+++ b/Mage.Sets/src/mage/sets/timespiral/GroundRift.java
@@ -60,7 +60,7 @@ public class GroundRift extends CardImpl {
         this.color.setRed(true);
 
         // Target creature without flying can't block this turn.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new CantBlockTargetEffect(Duration.EndOfTurn));
         // Storm
         this.addAbility(new StormAbility());
diff --git a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java
index 258931585b8..33a4e09f5ae 100644
--- a/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java
+++ b/Mage.Sets/src/mage/sets/timespiral/HarmonicSliver.java
@@ -74,7 +74,7 @@ public class HarmonicSliver extends CardImpl {
 
         // All Slivers have "When this permanent enters the battlefield, destroy target artifact or enchantment."
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        TargetPermanent target = new TargetPermanent(filter);
+        TargetPermanent target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(
diff --git a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java
index 32db0ef21bf..e5d9f071372 100644
--- a/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java
+++ b/Mage.Sets/src/mage/sets/timespiral/KrosanGrip.java
@@ -61,7 +61,7 @@ public class KrosanGrip extends CardImpl {
         // Split second
         this.addAbility(new SplitSecondAbility());
         // Destroy target artifact or enchantment.
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/torment/FranticPurification.java b/Mage.Sets/src/mage/sets/torment/FranticPurification.java
index 06c523440b5..eca1354032f 100644
--- a/Mage.Sets/src/mage/sets/torment/FranticPurification.java
+++ b/Mage.Sets/src/mage/sets/torment/FranticPurification.java
@@ -59,7 +59,7 @@ public class FranticPurification extends CardImpl {
 
         // Destroy target enchantment.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
 
         // Madness {W}
         this.addAbility(new MadnessAbility(this, new ManaCostsImpl("{W}")));
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java
index f2fbeccec10..6ec80ba856d 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/Attrition.java
@@ -63,7 +63,7 @@ public class Attrition extends CardImpl {
         //{B}, Sacrifice a creature: Destroy target nonblack creature.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(true)));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java
index dbc702184f7..4cd79b9efe6 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/KeldonVandals.java
@@ -65,7 +65,7 @@ public class KeldonVandals extends CardImpl {
         this.addAbility(new EchoAbility("{2}{R}"));
         // When Keldon Vandals enters the battlefield, destroy target artifact.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java b/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java
index 14ce187a0a0..5e739bc3327 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/SigilOfSleep.java
@@ -80,7 +80,7 @@ public class SigilOfSleep extends CardImpl {
             if (playerId != null) {
                 FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that player controls");
                 filter.add(new ControllerIdPredicate(playerId));
-                Target target = new TargetCreaturePermanent(filter);
+                Target target = new TargetCreaturePermanent(filter, true);
                 target.setRequired(true);
                 ability.getTargets().clear();
                 ability.addTarget(target);
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java
index 5f3d4b85768..4f5f482410e 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/BoneShredder.java
@@ -71,7 +71,7 @@ public class BoneShredder extends CardImpl {
 
         //When Bone Shredder enters the battlefield, destroy target nonartifact, nonblack creature.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(false));
-        Target target = new TargetCreaturePermanent(filter);
+        Target target = new TargetCreaturePermanent(filter, true);
         target.setTargetName("nonartifact, nonblack creature");
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java b/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java
index 8ce517422db..d5ff34d28c9 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/DevoutHarpist.java
@@ -67,7 +67,7 @@ public class DevoutHarpist extends CardImpl {
 
         // {tap}: Destroy target Aura attached to a creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
         
     }
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java
index 0c6ed5bd25d..83a20af3114 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/Erase.java
@@ -58,7 +58,7 @@ public class Erase extends CardImpl {
     public void build() {
         // Exile target enchantment.
         this.getSpellAbility().addEffect(new ExileTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public Erase(final Erase card) {
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java
index 4a9126ca956..72c67640979 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/KingCrab.java
@@ -67,7 +67,7 @@ public class KingCrab extends CardImpl {
         // {1}{U}, {tap}: Put target green creature on top of its owner's library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutOnLibraryTargetEffect(true), new ManaCostsImpl("{1}{U}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
 
     }
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java
index 42904654103..28434e43a2f 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/Parch.java
@@ -62,7 +62,7 @@ public class Parch extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
         Mode mode = new Mode();
         mode.getEffects().add(new DamageTargetEffect(4));
-        mode.getTargets().add(new TargetCreaturePermanent(filter));
+        mode.getTargets().add(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addMode(mode);
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java
index 2ed53dd33df..ea95e126235 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/RadiantsJudgment.java
@@ -57,7 +57,7 @@ public class RadiantsJudgment extends CardImpl {
 
         // Destroy target creature with power 4 or greater.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         // Cycling {2}
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
     }
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java
index dea88f37dfc..a0bc2ce95c9 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/RingOfGix.java
@@ -68,7 +68,7 @@ public class RingOfGix extends CardImpl {
         // {1}, {tap}: Tap target artifact, creature, or land.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{1}"));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java
index 99ab3270c48..a92b30573d8 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/WingSnare.java
@@ -57,7 +57,7 @@ public class WingSnare extends CardImpl {
 
         // Destroy target creature with flying.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public WingSnare(final WingSnare card) {
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Clear.java b/Mage.Sets/src/mage/sets/urzassaga/Clear.java
index f6df98c6f61..bd410c808e0 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Clear.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Clear.java
@@ -56,7 +56,7 @@ public class Clear extends CardImpl {
         this.expansionSetCode = "USG";
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java
index b8252fb3815..aa2564f52f6 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/DarkHatchling.java
@@ -67,7 +67,7 @@ public class DarkHatchling extends CardImpl {
 
         // When Dark Hatchling enters the battlefield, destroy target nonblack creature. It can't be regenerated.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(true));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java
index 5cb86ee3f74..96ba447fe1d 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/EasternPaladin.java
@@ -66,7 +66,7 @@ public class EasternPaladin extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
                 ability.addCost(new TapSourceCost());
                 this.addAbility(ability);
         }
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Expunge.java b/Mage.Sets/src/mage/sets/urzassaga/Expunge.java
index 16ed868e80a..1c6ddf73879 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Expunge.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Expunge.java
@@ -60,7 +60,7 @@ public class Expunge extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target nonartifact, nonblack creature. It can't be regenerated.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
 		// Cycling {2} ({2}, Discard this card: Draw a card.)
 		this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
diff --git a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java
index 4da9e11dd7f..5b318ca6cf0 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/IntrepidHero.java
@@ -66,7 +66,7 @@ public class IntrepidHero extends CardImpl {
 
         // {tap}: Destroy target creature with power 4 or greater.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java
index 67ea827179a..0acf713e4ab 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Scrap.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Scrap.java
@@ -56,7 +56,7 @@ public class Scrap extends CardImpl {
         this.expansionSetCode = "USG";
         this.color.setRed(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
     }
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java
index 99866750baf..550cc45b969 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/SternProctor.java
@@ -66,7 +66,7 @@ public class SternProctor extends CardImpl {
 
         // When Stern Proctor enters the battlefield, return target artifact or enchantment to its owner's hand.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false);
-        TargetPermanent target = new TargetPermanent(filter);
+        TargetPermanent target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java b/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java
index f53200ef7ce..d60fb30aedb 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/WesternPaladin.java
@@ -66,7 +66,7 @@ public class WesternPaladin extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{B}{B}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
                 ability.addCost(new TapSourceCost());
                 this.addAbility(ability);
         }
diff --git a/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java b/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java
index b61e74da054..ae2b345d3dd 100644
--- a/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java
+++ b/Mage.Sets/src/mage/sets/visions/DarajaGriffin.java
@@ -68,7 +68,7 @@ public class DarajaGriffin extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // Sacrifice Daraja Griffin: Destroy target black creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new SacrificeSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java b/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java
index e0182ddf483..e6d3457d072 100644
--- a/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java
+++ b/Mage.Sets/src/mage/sets/weatherlight/FatalBlow.java
@@ -56,7 +56,7 @@ public class FatalBlow extends CardImpl {
 
         // Destroy target creature that was dealt damage this turn. It can't be regenerated.
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
     }
 
     public FatalBlow(final FatalBlow card) {
diff --git a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java
index b6e3ca45970..bc86f39cf3e 100644
--- a/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java
+++ b/Mage.Sets/src/mage/sets/worldwake/AEtherTradewinds.java
@@ -60,7 +60,7 @@ public class AEtherTradewinds extends CardImpl {
 
         // Return target permanent you control and target permanent you don't control to their owners' hands.
         this.getSpellAbility().addTarget(new TargetControlledPermanent(true));
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new AEtherTradewindsEffect());
         
     }
diff --git a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java
index ece4530e945..80c768be663 100644
--- a/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java
+++ b/Mage.Sets/src/mage/sets/worldwake/AdmonitionAngel.java
@@ -74,7 +74,7 @@ public class AdmonitionAngel extends CardImpl {
 
         // Landfall - Whenever a land enters the battlefield under your control, you may exile target nonland permanent other than Admonition Angel.
         TriggeredAbility ability = new LandfallAbility(Zone.BATTLEFIELD, new ExileTargetForSourceEffect("Admonition Angel Exile"), true);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(ability);
 
         // When Admonition Angel leaves the battlefield, return all cards exiled with it to the battlefield under their owners' control.
diff --git a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
index f5d846b43f8..d41be663017 100644
--- a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
+++ b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
@@ -107,7 +107,7 @@ class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl {
                 filter.setMessage("creature controlled by " + game.getPlayer(event.getTargetId()).getName());
 
                 this.getTargets().clear();
-                this.addTarget(new TargetPermanent(filter));
+                this.addTarget(new TargetPermanent(filter, true));
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java
index faaf1804c39..7cd28a81e5e 100644
--- a/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java
+++ b/Mage.Sets/src/mage/sets/worldwake/IonasJudgment.java
@@ -56,7 +56,7 @@ public class IonasJudgment extends CardImpl {
         this.expansionSetCode = "WWK";
         this.color.setWhite(true);
         this.getSpellAbility().addEffect(new ExileTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
 
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java
index c857cfd12e0..4488104df4a 100644
--- a/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java
+++ b/Mage.Sets/src/mage/sets/worldwake/MordantDragon.java
@@ -99,7 +99,7 @@ class MordantDragonEffect extends OneShotEffect {
             if (amount > 0) {
                 FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + player.getName() + " controls");
                 filter.add(new ControllerIdPredicate(player.getId()));
-                TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+                TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
                 if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Damage, source.getControllerId(), source.getId(), game)) {
                     UUID creature = target.getFirstTarget();
                     if (creature != null) {
diff --git a/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java
index 90eb54b9007..16502e76818 100644
--- a/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java
+++ b/Mage.Sets/src/mage/sets/worldwake/NaturesClaim.java
@@ -65,7 +65,7 @@ public class NaturesClaim extends CardImpl {
         this.color.setGreen(true);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new NaturesClaimEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
     }
 
     public NaturesClaim (final NaturesClaim card) {
diff --git a/Mage.Sets/src/mage/sets/worldwake/Smother.java b/Mage.Sets/src/mage/sets/worldwake/Smother.java
index 0050b199de7..f4f3d15727b 100644
--- a/Mage.Sets/src/mage/sets/worldwake/Smother.java
+++ b/Mage.Sets/src/mage/sets/worldwake/Smother.java
@@ -55,7 +55,7 @@ public class Smother extends CardImpl {
 
         this.color.setBlack(true);
 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java
index 1b997d8135d..bad9ee75b1b 100644
--- a/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java
+++ b/Mage.Sets/src/mage/sets/worldwake/SurrakarBanisher.java
@@ -61,7 +61,7 @@ public class SurrakarBanisher extends CardImpl {
         this.toughness = new MageInt(3);
 
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), true);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java
index 279d8aef2a2..e51ac938423 100644
--- a/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java
+++ b/Mage.Sets/src/mage/sets/worldwake/TideforceElemental.java
@@ -73,7 +73,7 @@ public class TideforceElemental extends CardImpl {
                 new MayTapOrUntapTargetEffect(), 
                 new ColoredManaCost(ColoredManaSymbol.U));
         ability.addCost(new TapSourceCost());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
         // Landfall - Whenever a land enters the battlefield under your control, you may untap Tideforce Elemental.
         this.addAbility(new LandfallAbility(new UntapSourceEffect(), true));
diff --git a/Mage.Sets/src/mage/sets/worldwake/Twitch.java b/Mage.Sets/src/mage/sets/worldwake/Twitch.java
index 6a1ef5cf4ea..1428c60c202 100644
--- a/Mage.Sets/src/mage/sets/worldwake/Twitch.java
+++ b/Mage.Sets/src/mage/sets/worldwake/Twitch.java
@@ -62,7 +62,7 @@ public class Twitch extends CardImpl {
         // You may tap or untap target artifact, creature, or land.
         // Draw a card.
         this.getSpellAbility().addEffect(new MayTapOrUntapTargetEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
     }
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java
index 0bb098da55e..6e89e16b3a8 100644
--- a/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java
+++ b/Mage.Sets/src/mage/sets/worldwake/UrgeToFeed.java
@@ -63,7 +63,7 @@ public class UrgeToFeed extends CardImpl {
 
         // Target creature gets -3/-3 until end of turn. You may tap any number of untapped Vampire creatures you control. If you do, put a +1/+1 counter on each of those Vampires.
         this.getSpellAbility().addEffect(new BoostTargetEffect(-3, -3, Duration.EndOfTurn));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new UrgeToFeedEffect());
     }
 
@@ -98,7 +98,7 @@ class UrgeToFeedEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
+        TargetCreaturePermanent target = new TargetCreaturePermanent(filter, true);
         while (true) {
             target.clearChosen();
             if (target.canChoose(source.getControllerId(), game) && target.choose(Outcome.Tap, source.getControllerId(), source.getId(), game)) {
diff --git a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java
index d6be086a32c..474041a4e15 100644
--- a/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java
+++ b/Mage.Sets/src/mage/sets/zendikar/HaloHunter.java
@@ -63,7 +63,7 @@ public class HaloHunter extends CardImpl {
 
         this.addAbility(IntimidateAbility.getInstance());
         Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java
index 69f61d2e237..4d36bf36ca2 100644
--- a/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java
+++ b/Mage.Sets/src/mage/sets/zendikar/HideousEnd.java
@@ -58,7 +58,7 @@ public class HideousEnd extends CardImpl {
         this.color.setBlack(true);
 
         // Destroy target nonblack creature. Its controller loses 2 life.
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter, true));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(2));
     }
diff --git a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java
index 35cac52f6ec..4083ad3d628 100644
--- a/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java
+++ b/Mage.Sets/src/mage/sets/zendikar/JourneyToNowhere.java
@@ -56,7 +56,7 @@ public class JourneyToNowhere extends CardImpl {
         FilterCreaturePermanent filter = new FilterCreaturePermanent();
         filter.add(new AnotherPredicate());
         Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect("Journey to Nowhere exile"), false);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability1.addTarget(target);
         this.addAbility(ability1);
diff --git a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java
index 19a41fc4e28..cd5a03e0522 100644
--- a/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java
+++ b/Mage.Sets/src/mage/sets/zendikar/KorHookmaster.java
@@ -64,7 +64,7 @@ public class KorHookmaster extends CardImpl {
 
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new TapTargetEffect());
         ability.addEffect(new SkipNextUntapTargetEffect());
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java
index 028a6e443ae..cbaf834046e 100644
--- a/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java
+++ b/Mage.Sets/src/mage/sets/zendikar/KorSanctifiers.java
@@ -71,7 +71,7 @@ public class KorSanctifiers extends CardImpl {
 
         // When Kor Sanctifiers enters the battlefield, if it was kicked, destroy target artifact or enchantment.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetPermanent(filter));
+        ability.addTarget(new TargetPermanent(filter, true));
         this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, destroy target artifact or enchantment."));
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java
index 1d8a10446d7..b28401ced46 100644
--- a/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java
+++ b/Mage.Sets/src/mage/sets/zendikar/MerfolkSeastalkers.java
@@ -67,7 +67,7 @@ public class MerfolkSeastalkers extends CardImpl {
 
         this.addAbility(new IslandwalkAbility());
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{2}{U}"));
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java
index d83cea15572..00c2300e1ef 100644
--- a/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java
+++ b/Mage.Sets/src/mage/sets/zendikar/MoldShambler.java
@@ -71,7 +71,7 @@ public class MoldShambler extends CardImpl {
 
         // When Mold Shambler enters the battlefield, if it was kicked, destroy target noncreature permanent.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        Target target = new TargetPermanent(filter);
+        Target target = new TargetPermanent(filter, true);
         target.setRequired(true);
         ability.addTarget(target);
         this.addAbility(new ConditionalTriggeredAbility(ability, new LockedInCondition(KickedCondition.getInstance()), "When {this} enters the battlefield, if it was kicked, destroy target noncreature permanent."));
diff --git a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java
index 86ddc084931..4baaf2f88c4 100644
--- a/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java
+++ b/Mage.Sets/src/mage/sets/zendikar/OranRiefRecluse.java
@@ -72,7 +72,7 @@ public class OranRiefRecluse extends CardImpl {
 
         // When Oran-Rief Recluse enters the battlefield, if it was kicked, destroy target creature with flying.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect(), false);
-        ability.addTarget(new TargetCreaturePermanent(filter));
+        ability.addTarget(new TargetCreaturePermanent(filter, true));
         this.addAbility(new ConditionalTriggeredAbility(ability, KickedCondition.getInstance(), "When {this} enters the battlefield, if it was kicked, destroy target creature with flying."));
     }
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java
index 5b42c2e6ca0..fb50b70bf19 100644
--- a/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java
+++ b/Mage.Sets/src/mage/sets/zendikar/RelicCrush.java
@@ -63,7 +63,7 @@ public class RelicCrush extends CardImpl {
 
         // Destroy target artifact or enchantment and up to one other target artifact or enchantment.
         this.getSpellAbility().addEffect(new RelicCrushEffect());
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
+        this.getSpellAbility().addTarget(new TargetPermanent(filter, true));
         this.getSpellAbility().addTarget(new TargetPermanent(0, 1, filter, false));
         
     }