diff --git a/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java b/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java
index 17af9f4e0dd..7d636885db1 100644
--- a/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java
+++ b/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java
@@ -36,7 +36,7 @@ public final class FrostpyreArcanist extends CardImpl {
 
     private static final FilterPermanent filter = new FilterControlledPermanent("you control a Giant or a Wizard");
     private static final FilterCard filter2 = new FilterInstantOrSorceryCard(
-            "instant or sorcery card with the same name as a card in your graveyard"
+            "an instant or sorcery card with the same name as a card in your graveyard"
     );
 
     static {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java
index 788c3e37544..b727e317ad4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java
@@ -1,7 +1,6 @@
 
 package mage.abilities.effects.common.search;
 
-import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.SearchEffect;
 import mage.cards.Card;
@@ -14,8 +13,9 @@ import mage.players.Player;
 import mage.target.common.TargetCardInLibrary;
 import mage.util.CardUtil;
 
+import java.util.UUID;
+
 /**
- *
  * @author LokiX, BetaSteward_at_googlemail.com
  */
 public class SearchLibraryPutInHandEffect extends SearchEffect {
@@ -96,14 +96,26 @@ public class SearchLibraryPutInHandEffect extends SearchEffect {
         sb.append(rulePrefix);
         if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
             sb.append("up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
-            sb.append(target.getTargetName()).append(revealCards ? ", reveal them," : "").append(" and put them into your hand");
+            sb.append(target.getTargetName());
+            if (forceShuffle) {
+                sb.append(revealCards ? ", reveal them" : "");
+                sb.append(", put them into your hand, then shuffle your library");
+            } else {
+                sb.append(revealCards ? ", reveal them," : "");
+                sb.append(" and put them into your hand. If you do, shuffle your library");
+            }
         } else {
-            sb.append("a ").append(target.getTargetName()).append(revealCards ? ", reveal it," : "").append(" and put that card into your hand");
-        }
-        if (forceShuffle) {
-            sb.append(". Then shuffle your library");
-        } else {
-            sb.append(". If you do, shuffle your library");
+            if (!target.getTargetName().startsWith("a ") && !target.getTargetName().startsWith("an ")) {
+                sb.append("a ");
+            }
+            sb.append(target.getTargetName());
+            if (forceShuffle) {
+                sb.append(revealCards ? ", reveal it" : "");
+                sb.append(", put it into your hand, then shuffle your library");
+            } else {
+                sb.append(revealCards ? ", reveal it," : "");
+                sb.append(" and put that card into your hand. If you do, shuffle your library");
+            }
         }
         staticText = sb.toString();
     }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java
index 1352d886ae2..677f499e341 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java
@@ -84,17 +84,20 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect {
             } else {
                 sb.append("up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
             }
-            sb.append(target.getTargetName()).append(" and put them onto the battlefield");
+            sb.append(target.getTargetName());
+            sb.append(forceShuffle ? ", " : " and ");
+            sb.append("put them onto the battlefield");
         } else {
             sb.append(target.getTargetName().startsWith("a ") || target.getTargetName().startsWith("an ") ? "" : "a ")
-                    .append(target.getTargetName())
-                    .append(" and put it onto the battlefield");
+                    .append(target.getTargetName());
+            sb.append(forceShuffle ? ", " : " and ");
+            sb.append("put it onto the battlefield");
         }
         if (tapped) {
             sb.append(" tapped");
         }
         if (forceShuffle) {
-            sb.append(". Then shuffle your library");
+            sb.append(", then shuffle your library");
         } else {
             sb.append(". If you do, shuffle your library");
         }