diff --git a/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java b/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java
index 4f5554fbdb3..b6287b7c0c2 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DivineVerdict.java
@@ -32,6 +32,7 @@ import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.cards.CardImpl;
+import mage.filter.common.FilterAttackingOrBlockingCreature;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.target.common.TargetCreaturePermanent;
 
@@ -56,7 +57,7 @@ public class DivineVerdict extends CardImpl<DivineVerdict> {
 
         this.color.setWhite(true);
 
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(FilterAttackingOrBlockingCreature.getDefault()));
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
     }
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java
index 19639c81438..41e807c970d 100644
--- a/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java
+++ b/Mage.Sets/src/mage/sets/magic2010/GoblinChieftain.java
@@ -39,6 +39,7 @@ import mage.abilities.effects.common.continious.BoostControlledEffect;
 import mage.abilities.effects.common.continious.GainAbilityControlledEffect;
 import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
+import mage.filter.Filter;
 import mage.filter.common.FilterCreaturePermanent;
 
 /**
@@ -51,6 +52,7 @@ public class GoblinChieftain extends CardImpl<GoblinChieftain> {
 
 	static {
 		filter.getSubtype().add("Goblin");
+        filter.setScopeSupertype(Filter.ComparisonScope.Any);
 	}
 
 	public GoblinChieftain(UUID ownerId) {
diff --git a/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java b/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java
index 62953fdedc0..444081d8d40 100644
--- a/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java
+++ b/Mage.Sets/src/mage/sets/worldwake/SejiriMerfolk.java
@@ -43,19 +43,23 @@ import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
 import mage.abilities.keyword.FirstStrikeAbility;
 import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
+import mage.filter.Filter;
+import mage.filter.common.FilterControlledPermanent;
 import mage.filter.common.FilterLandPermanent;
 
 /**
  *
- * @author North
+ * @author North, nantuko
  */
 public class SejiriMerfolk extends CardImpl<SejiriMerfolk> {
 
     private static final String rule = "As long as you control a Plains, {this} has first strike and lifelink.";
-    private static final FilterLandPermanent filter = new FilterLandPermanent("Plains");
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("Plains");
 
     static {
+        filter.getCardType().add(CardType.LAND);
         filter.getSubtype().add("Plains");
+        filter.setScopeSubtype(Filter.ComparisonScope.Any);
     }
 
     public SejiriMerfolk(UUID ownerId) {
diff --git a/Mage/src/mage/filter/common/FilterAttackingCreature.java b/Mage/src/mage/filter/common/FilterAttackingCreature.java
index 256eb582dd9..d248ebe9142 100644
--- a/Mage/src/mage/filter/common/FilterAttackingCreature.java
+++ b/Mage/src/mage/filter/common/FilterAttackingCreature.java
@@ -34,6 +34,8 @@ package mage.filter.common;
  */
 public class FilterAttackingCreature extends FilterCreaturePermanent<FilterAttackingCreature> {
 
+    private static final FilterAttackingCreature defaultFilter = new FilterAttackingCreature();
+
 	public FilterAttackingCreature() {
 		this("attacking creature");
 	}
@@ -52,4 +54,8 @@ public class FilterAttackingCreature extends FilterCreaturePermanent<FilterAttac
 	public FilterAttackingCreature copy() {
 		return new FilterAttackingCreature(this);
 	}
+
+    public static FilterAttackingCreature getDefault() {
+        return defaultFilter;
+    }
 }
diff --git a/Mage/src/mage/filter/common/FilterAttackingOrBlockingCreature.java b/Mage/src/mage/filter/common/FilterAttackingOrBlockingCreature.java
index d98d20d73c5..cf156af657b 100644
--- a/Mage/src/mage/filter/common/FilterAttackingOrBlockingCreature.java
+++ b/Mage/src/mage/filter/common/FilterAttackingOrBlockingCreature.java
@@ -28,12 +28,16 @@
 
 package mage.filter.common;
 
+import mage.filter.Filter;
+
 /**
  *
  * @author nantuko
  */
 public class FilterAttackingOrBlockingCreature extends FilterCreaturePermanent<FilterAttackingOrBlockingCreature> {
 
+    private static final FilterAttackingOrBlockingCreature defaultFilter = new FilterAttackingOrBlockingCreature();
+
 	public FilterAttackingOrBlockingCreature() {
 		this("attacking or blocking creature");
 	}
@@ -54,4 +58,8 @@ public class FilterAttackingOrBlockingCreature extends FilterCreaturePermanent<F
 	public FilterAttackingOrBlockingCreature copy() {
 		return new FilterAttackingOrBlockingCreature(this);
 	}
+
+    public static FilterAttackingOrBlockingCreature getDefault() {
+        return defaultFilter;
+    }
 }
diff --git a/Mage/src/mage/game/permanent/token/SpiritToken.java b/Mage/src/mage/game/permanent/token/SpiritToken.java
index 905f9117765..4a41c428fa4 100644
--- a/Mage/src/mage/game/permanent/token/SpiritToken.java
+++ b/Mage/src/mage/game/permanent/token/SpiritToken.java
@@ -1,3 +1,30 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
 package mage.game.permanent.token;
 
 import mage.Constants;