diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TirelessTracker.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TirelessTracker.java
index b52561c491..42c74f226c 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TirelessTracker.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/TirelessTracker.java
@@ -39,8 +39,9 @@ import mage.constants.Rarity;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.common.FilterLandPermanent;
+import mage.filter.common.FilterControlledLandPermanent;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
 
 /**
  *
@@ -48,6 +49,12 @@ import mage.filter.common.FilterLandPermanent;
  */
 public class TirelessTracker extends CardImpl {
 
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("a Clue");
+
+    static {
+        filter.add(new SubtypePredicate("Clue"));
+    }
+
     public TirelessTracker(UUID ownerId) {
         super(ownerId, 233, "Tireless Tracker", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{2}{G}");
         this.expansionSetCode = "SOI";
@@ -57,10 +64,10 @@ public class TirelessTracker extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Whenever a land enters the battlefield under your control, investigate. <i>(Put a colorless Clue artifact token onto the battlefield with "{2}, Sacrifice this artifact: Draw a card.")</i>
-        this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new InvestigateEffect(), new FilterLandPermanent("a land"), false, null, true));
+        this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new InvestigateEffect(), new FilterControlledLandPermanent("a land"), false, null, true));
 
         // Whenever you sacrifice a Clue, put a +1/+1 counter on Tireless Tracker.
-        this.addAbility(new SacrificeAllTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new FilterCreaturePermanent("Clue", "a Clue"), TargetController.YOU, false));
+        this.addAbility(new SacrificeAllTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter, TargetController.YOU, false));
     }
 
     public TirelessTracker(final TirelessTracker card) {