diff --git a/Mage/src/mage/filter/FilterImpl.java b/Mage/src/mage/filter/FilterImpl.java
index bbbc1662b05..4757dab3325 100644
--- a/Mage/src/mage/filter/FilterImpl.java
+++ b/Mage/src/mage/filter/FilterImpl.java
@@ -28,7 +28,7 @@
 
 package mage.filter;
 
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import mage.Constants.CardType;
 import mage.filter.predicate.Predicate;
@@ -44,7 +44,7 @@ public abstract class FilterImpl<E, T extends FilterImpl<E, T>> implements Filte
     protected static ListComparer<CardType> compCardType = new ListComparer<CardType>();
     protected static ListComparer<String> compString = new ListComparer<String>();
 
-    protected List<Predicate> predicates = new LinkedList<Predicate>();
+    protected List<Predicate> predicates = new ArrayList<Predicate>();
     protected String message;
     protected boolean notFilter = false;
 
@@ -58,7 +58,7 @@ public abstract class FilterImpl<E, T extends FilterImpl<E, T>> implements Filte
     public FilterImpl(FilterImpl filter) {
         this.message = filter.message;
         this.notFilter = filter.notFilter;
-        this.predicates = new LinkedList<Predicate>(filter.predicates);
+        this.predicates = new ArrayList<Predicate>(filter.predicates);
     }
 
     @Override
diff --git a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java
index 312fae73141..1deeefdd75a 100644
--- a/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/AbilityPredicate.java
@@ -37,7 +37,7 @@ import mage.game.Game;
  *
  * @author North
  */
-public class AbilityPredicate<T extends MageObject> implements Predicate<T> {
+public class AbilityPredicate implements Predicate<MageObject> {
 
     private final Class<?> abilityClass;
 
@@ -46,7 +46,7 @@ public class AbilityPredicate<T extends MageObject> implements Predicate<T> {
     }
 
     @Override
-    public boolean apply(T input, Game game) {
+    public boolean apply(MageObject input, Game game) {
         Abilities<Ability> abilities = input.getAbilities();
         for (int i = 0; i < abilities.size(); i++) {
             if (abilityClass.equals(abilities.get(i).getClass())) {
diff --git a/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java b/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java
index f3f2ee9ac8a..a9774d766eb 100644
--- a/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/CardTypePredicate.java
@@ -36,7 +36,7 @@ import mage.game.Game;
  *
  * @author North
  */
-public class CardTypePredicate<T extends MageObject> implements Predicate<T> {
+public class CardTypePredicate implements Predicate<MageObject> {
 
     private final CardType cardType;
 
@@ -45,7 +45,7 @@ public class CardTypePredicate<T extends MageObject> implements Predicate<T> {
     }
 
     @Override
-    public boolean apply(T input, Game game) {
+    public boolean apply(MageObject input, Game game) {
         return input.getCardType().contains(cardType);
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/ColorPredicate.java b/Mage/src/mage/filter/predicate/mageobject/ColorPredicate.java
index f78c5826a2c..0eba7899aff 100644
--- a/Mage/src/mage/filter/predicate/mageobject/ColorPredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/ColorPredicate.java
@@ -36,7 +36,7 @@ import mage.game.Game;
  *
  * @author North
  */
-public class ColorPredicate<T extends MageObject> implements Predicate<T> {
+public class ColorPredicate implements Predicate<MageObject> {
 
     private final ObjectColor color;
 
@@ -45,7 +45,7 @@ public class ColorPredicate<T extends MageObject> implements Predicate<T> {
     }
 
     @Override
-    public boolean apply(T input, Game game) {
+    public boolean apply(MageObject input, Game game) {
         return input.getColor().contains(color);
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/ColorlessPredicate.java b/Mage/src/mage/filter/predicate/mageobject/ColorlessPredicate.java
index 9d779a48956..8a7718bf386 100644
--- a/Mage/src/mage/filter/predicate/mageobject/ColorlessPredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/ColorlessPredicate.java
@@ -35,10 +35,10 @@ import mage.game.Game;
  *
  * @author North
  */
-public class ColorlessPredicate<T extends MageObject> implements Predicate<T> {
+public class ColorlessPredicate implements Predicate<MageObject> {
 
     @Override
-    public boolean apply(T input, Game game) {
+    public boolean apply(MageObject input, Game game) {
         return input.getColor().isColorless();
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java b/Mage/src/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java
index bb2b22fabf6..e6792d53330 100644
--- a/Mage/src/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/ConvertedManaCostPredicate.java
@@ -35,14 +35,14 @@ import mage.filter.predicate.IntComparePredicate;
  *
  * @author North
  */
-public class ConvertedManaCostPredicate<T extends MageObject> extends IntComparePredicate<T> {
+public class ConvertedManaCostPredicate extends IntComparePredicate<MageObject> {
 
     public ConvertedManaCostPredicate(Filter.ComparisonType type, int value) {
         super(type, value);
     }
 
     @Override
-    protected int getInputValue(T input) {
+    protected int getInputValue(MageObject input) {
         return input.getManaCost().convertedManaCost();
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java b/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java
index c0bead3cf0d..505e37efdef 100644
--- a/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/NamePredicate.java
@@ -35,7 +35,7 @@ import mage.game.Game;
  *
  * @author North
  */
-public class NamePredicate<T extends MageObject> implements Predicate<T> {
+public class NamePredicate implements Predicate<MageObject> {
 
     private final String name;
 
@@ -44,7 +44,7 @@ public class NamePredicate<T extends MageObject> implements Predicate<T> {
     }
 
     @Override
-    public boolean apply(T input, Game game) {
+    public boolean apply(MageObject input, Game game) {
         return name.equals(input.getName());
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/PowerPredicate.java b/Mage/src/mage/filter/predicate/mageobject/PowerPredicate.java
index 218e29aa2b2..0fc1b03cdf9 100644
--- a/Mage/src/mage/filter/predicate/mageobject/PowerPredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/PowerPredicate.java
@@ -35,14 +35,14 @@ import mage.filter.predicate.IntComparePredicate;
  *
  * @author North
  */
-public class PowerPredicate<T extends MageObject> extends IntComparePredicate<T> {
+public class PowerPredicate extends IntComparePredicate<MageObject> {
 
     public PowerPredicate(Filter.ComparisonType type, int value) {
         super(type, value);
     }
 
     @Override
-    protected int getInputValue(T input) {
+    protected int getInputValue(MageObject input) {
         return input.getPower().getValue();
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java b/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java
index d19169f2ce3..b43518ae6e6 100644
--- a/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/SubtypePredicate.java
@@ -35,7 +35,7 @@ import mage.game.Game;
  *
  * @author North
  */
-public class SubtypePredicate<T extends MageObject> implements Predicate<T> {
+public class SubtypePredicate implements Predicate<MageObject> {
 
     private final String subtype;
 
@@ -44,7 +44,7 @@ public class SubtypePredicate<T extends MageObject> implements Predicate<T> {
     }
 
     @Override
-    public boolean apply(T input, Game game) {
+    public boolean apply(MageObject input, Game game) {
         return input.getSubtype().contains(subtype);
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/SupertypePredicate.java b/Mage/src/mage/filter/predicate/mageobject/SupertypePredicate.java
index dc681e1b2d3..ff0e5ed0afe 100644
--- a/Mage/src/mage/filter/predicate/mageobject/SupertypePredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/SupertypePredicate.java
@@ -35,7 +35,7 @@ import mage.game.Game;
  *
  * @author North
  */
-public class SupertypePredicate<T extends MageObject> implements Predicate<T> {
+public class SupertypePredicate implements Predicate<MageObject> {
 
     private final String supertype;
 
@@ -44,7 +44,7 @@ public class SupertypePredicate<T extends MageObject> implements Predicate<T> {
     }
 
     @Override
-    public boolean apply(T input, Game game) {
+    public boolean apply(MageObject input, Game game) {
         return input.getSupertype().contains(supertype);
     }
 
diff --git a/Mage/src/mage/filter/predicate/mageobject/ToughnessPredicate.java b/Mage/src/mage/filter/predicate/mageobject/ToughnessPredicate.java
index e03231842fe..d1b2ef78ae5 100644
--- a/Mage/src/mage/filter/predicate/mageobject/ToughnessPredicate.java
+++ b/Mage/src/mage/filter/predicate/mageobject/ToughnessPredicate.java
@@ -35,14 +35,14 @@ import mage.filter.predicate.IntComparePredicate;
  *
  * @author North
  */
-public class ToughnessPredicate<T extends MageObject> extends IntComparePredicate<T> {
+public class ToughnessPredicate extends IntComparePredicate<MageObject> {
 
     public ToughnessPredicate(Filter.ComparisonType type, int value) {
         super(type, value);
     }
 
     @Override
-    protected int getInputValue(T input) {
+    protected int getInputValue(MageObject input) {
         return input.getToughness().getValue();
     }