diff --git a/Mage.Sets/src/mage/cards/l/LightningCoreExcavator.java b/Mage.Sets/src/mage/cards/l/LightningCoreExcavator.java
index bceff2ac0f3..b0ee776149c 100644
--- a/Mage.Sets/src/mage/cards/l/LightningCoreExcavator.java
+++ b/Mage.Sets/src/mage/cards/l/LightningCoreExcavator.java
@@ -11,9 +11,9 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.target.common.TargetAnyTarget;
-
 import java.util.UUID;
+import mage.filter.common.FilterCreaturePlayerOrPlaneswalker;
+import mage.target.common.TargetAnyTarget;
 
 /**
  * @author TheElk801
@@ -29,11 +29,11 @@ public final class LightningCoreExcavator extends CardImpl {
 
         // {5}, {T}, Sacrifice Lightning-Core Excavator: It deals 3 damage to any target.
         Ability ability = new SimpleActivatedAbility(
-                new DamageTargetEffect(3, "it"), new GenericManaCost(5)
+                new DamageTargetEffect(3), new GenericManaCost(5)
         );
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetAnyTarget());
+        ability.addTarget(new TargetAnyTarget(new FilterCreaturePlayerOrPlaneswalker("any target")));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java b/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java
index b57dbfc34da..23d40fbc687 100644
--- a/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java
+++ b/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java
@@ -111,7 +111,7 @@ class OrmosArchiveKeeperEffect extends ReplacementEffectImpl {
 
 class OrmosArchiveKeeperTarget extends TargetCardInHand {
 
-    private static final FilterCard filter = new FilterCard("cards with different names");
+    private static final FilterCard filter = new FilterCard("3 cards with different names");
 
     OrmosArchiveKeeperTarget() {
         super(3, filter);
diff --git a/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java b/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java
index 0659eaf2218..4a3f8092627 100644
--- a/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java
+++ b/Mage.Sets/src/mage/cards/w/WitchOfTheMoors.java
@@ -39,14 +39,15 @@ public final class WitchOfTheMoors extends CardImpl {
         // Deathtouch
         this.addAbility(DeathtouchAbility.getInstance());
 
-        // At the beginning of your end step, if you gained life this turn, each opponent sacrifices a creature and you return up to one target creature card from your graveyard to your hand.
+        // At the beginning of your end step, if you gained life this turn, each opponent sacrifices a 
+        // creature and you return up to one target creature card from your graveyard to your hand.
         Ability ability = new ConditionalInterveningIfTriggeredAbility(
                 new BeginningOfEndStepTriggeredAbility(new SacrificeOpponentsEffect(
                         StaticFilters.FILTER_PERMANENT_A_CREATURE
                 ), TargetController.YOU, false),
-                condition, "At the beginning of your end step, if you gained life this turn, " +
-                "each opponent sacrifices a creature and you return up to one target creature card " +
-                "from your graveyard to your hand"
+                condition, "At the beginning of your end step, if you gained life this turn, "
+                + "each opponent sacrifices a creature and you return up to one target creature card "
+                + "from your graveyard to your hand."
         );
         ability.addEffect(new ReturnFromGraveyardToHandTargetEffect());
         ability.addTarget(new TargetCardInYourGraveyard(
diff --git a/Mage/src/main/java/mage/target/TargetImpl.java b/Mage/src/main/java/mage/target/TargetImpl.java
index 20972f39d74..8c36e138c89 100644
--- a/Mage/src/main/java/mage/target/TargetImpl.java
+++ b/Mage/src/main/java/mage/target/TargetImpl.java
@@ -112,7 +112,10 @@ public abstract class TargetImpl implements Target {
             sb.append(suffix);
             return sb.toString();
         }
-        if (targetName.startsWith("another") || targetName.startsWith("a ") || targetName.startsWith("an ")) {
+        if (targetName.startsWith("another") 
+                || targetName.startsWith("a ") 
+                || targetName.startsWith("an ")
+                || targetName.startsWith("any ")) {
             return "Select " + targetName + suffix;
         } else if (targetName.startsWith("a") || targetName.startsWith("e") || targetName.startsWith("i") || targetName.startsWith("o") || targetName.startsWith("u")) {
             return "Select an " + targetName + suffix;