diff --git a/Mage.Sets/src/mage/cards/d/DeeprootHistorian.java b/Mage.Sets/src/mage/cards/d/DeeprootHistorian.java
index fee49d05f70..6a4ecf81d8f 100644
--- a/Mage.Sets/src/mage/cards/d/DeeprootHistorian.java
+++ b/Mage.Sets/src/mage/cards/d/DeeprootHistorian.java
@@ -8,7 +8,6 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
-import mage.filter.StaticFilters;
 import mage.filter.predicate.Predicates;
 
 import java.util.UUID;
@@ -34,7 +33,7 @@ public final class DeeprootHistorian extends CardImpl {
 
         // Merfolk and Druid cards in your graveyard have retrace.
         this.addAbility(new SimpleStaticAbility(
-                new GainRetraceYourGraveyardEffect(StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY)
+                new GainRetraceYourGraveyardEffect(filter)
         ));
     }
 
@@ -46,4 +45,4 @@ public final class DeeprootHistorian extends CardImpl {
     public DeeprootHistorian copy() {
         return new DeeprootHistorian(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java b/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java
index bdce8067239..9b3ddf2e662 100644
--- a/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java
+++ b/Mage.Sets/src/mage/cards/e/EnterTheInfinite.java
@@ -1,4 +1,3 @@
-
 package mage.cards.e;
 
 import mage.abilities.Ability;
@@ -30,7 +29,8 @@ public final class EnterTheInfinite extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{8}{U}{U}{U}{U}");
 
         // Draw cards equal to the number of cards in your library,
-        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(CardsInControllerLibraryCount.instance));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(CardsInControllerLibraryCount.instance)
+                .setText("draw cards equal to the number of cards in your library"));
         //then put a card from your hand on top of your library.
         this.getSpellAbility().addEffect(new PutCardOnLibraryEffect());
         //You have no maximum hand size until your next turn.
@@ -51,7 +51,7 @@ class PutCardOnLibraryEffect extends OneShotEffect {
 
     PutCardOnLibraryEffect() {
         super(Outcome.DrawCard);
-        staticText = "Then put a card from your hand on top of your library";
+        staticText = ", then put a card from your hand on top of your library";
     }
 
     private PutCardOnLibraryEffect(final PutCardOnLibraryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HapatrasMark.java b/Mage.Sets/src/mage/cards/h/HapatrasMark.java
index 65a6051f28e..a602017f2e2 100644
--- a/Mage.Sets/src/mage/cards/h/HapatrasMark.java
+++ b/Mage.Sets/src/mage/cards/h/HapatrasMark.java
@@ -1,4 +1,3 @@
-
 package mage.cards.h;
 
 import java.util.UUID;
@@ -23,7 +22,8 @@ public final class HapatrasMark extends CardImpl {
 
         // Target creature you control gains hexproof until end of turn. Remove all -1/-1 counters from it.
         getSpellAbility().addEffect(new GainAbilityTargetEffect(HexproofAbility.getInstance(), Duration.EndOfTurn));
-        getSpellAbility().addEffect(new RemoveAllCountersPermanentTargetEffect(CounterType.M1M1));
+        getSpellAbility().addEffect(new RemoveAllCountersPermanentTargetEffect(CounterType.M1M1)
+                .setText("remove all -1/-1 counters from it"));
         getSpellAbility().addTarget(new TargetControlledCreaturePermanent());
     }
 
diff --git a/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java b/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java
index 1fd11461fc1..7c78fd50ba3 100644
--- a/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java
+++ b/Mage.Sets/src/mage/cards/u/UnbreathingHorde.java
@@ -36,6 +36,7 @@ public final class UnbreathingHorde extends CardImpl {
         // If Unbreathing Horde would be dealt damage, prevent that damage and remove a +1/+1 counter from it.
         this.addAbility(new SimpleStaticAbility(
                 new PreventDamageAndRemoveCountersEffect(false, false, true)
+                        .setText("If {this} would be dealt damage, prevent that damage and remove a +1/+1 counter from it.")
         ), PreventDamageAndRemoveCountersEffect.createWatcher());
     }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersPermanentTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersPermanentTargetEffect.java
index 913e677ac58..888eaaf9cd6 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersPermanentTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/counter/RemoveAllCountersPermanentTargetEffect.java
@@ -1,7 +1,7 @@
-
 package mage.abilities.effects.common.counter;
 
 import mage.abilities.Ability;
+import mage.abilities.Mode;
 import mage.abilities.effects.OneShotEffect;
 import mage.constants.Outcome;
 import mage.counters.CounterType;
@@ -24,7 +24,6 @@ public class RemoveAllCountersPermanentTargetEffect extends OneShotEffect {
     public RemoveAllCountersPermanentTargetEffect(CounterType counterType) {
         super(Outcome.Neutral);
         this.counterType = counterType;
-        staticText = "remove all " + (counterType == null ? "" : counterType.getName() + " ") + "counters from it.";
     }
 
     public RemoveAllCountersPermanentTargetEffect(RemoveAllCountersPermanentTargetEffect effect) {
@@ -50,4 +49,14 @@ public class RemoveAllCountersPermanentTargetEffect extends OneShotEffect {
     public RemoveAllCountersPermanentTargetEffect copy() {
         return new RemoveAllCountersPermanentTargetEffect(this);
     }
+
+    @Override
+    public String getText(Mode mode) {
+        if (staticText != null && !staticText.isEmpty()) {
+            return staticText;
+        }
+        return "remove all " + (counterType == null ? "" : counterType.getName() + " ") + "counters from "
+                + getTargetPointer().describeTargets(mode.getTargets(), "it");
+    }
+
 }
diff --git a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java
index 3dd12d53e54..6eed22488a1 100644
--- a/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/WrennAndSixEmblem.java
@@ -3,7 +3,8 @@ package mage.game.command.emblems;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.continuous.GainRetraceYourGraveyardEffect;
 import mage.constants.Zone;
-import mage.filter.StaticFilters;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterInstantOrSorceryCard;
 import mage.game.command.Emblem;
 
 /**
@@ -11,11 +12,13 @@ import mage.game.command.Emblem;
  */
 public final class WrennAndSixEmblem extends Emblem {
 
+    private static final FilterCard filter = new FilterInstantOrSorceryCard("instant and sorcery cards");
+
     public WrennAndSixEmblem() {
         super("Emblem Wrenn");
         // Instant and sorcery cards in your graveyard have retrace.
         this.getAbilities().add(new SimpleStaticAbility(
-                Zone.COMMAND, new GainRetraceYourGraveyardEffect(StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY)
+                Zone.COMMAND, new GainRetraceYourGraveyardEffect(filter)
         ));
     }