diff --git a/res/cards.txt b/res/cards.txt
index 320322c2500..e7c89b466c5 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,15 @@
+Celestial Purge
+1 W
+Instant
+Exile target black or red permanent.
+spBounceTgt:Permanent.Black,Permanent.Red:Exile
+
+Unmake
+WB WB WB
+Instant
+Remove target creature from the game.
+spBounceTgt:Creature:Exile
+
 Saprazzan Raider
 2 U
 Creature Merfolk
@@ -12233,11 +12245,6 @@ Creature Kor Scout
 When Kor Cartographer enters the battlefield, you may search your library for a plains card, put it onto the battlefield tapped, then shuffle your library.
 2/2
 
-Celestial Purge
-1 W
-Instant
-Exile target black or red permanent.
-
 Ajani Vengeant
 2 R W
 Planeswalker - Ajani
@@ -17275,11 +17282,6 @@ Instant
 Destroy target creature. It can't be regenerated.
 spDestroyTgt:Creature:NoRegen
 
-Unmake
-WB WB WB
-Instant
-Remove target creature from the game.
-
 Flame Javelin
 2/R 2/R 2/R
 Instant
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 43dd87bdf51..c01f3dc867d 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -2194,22 +2194,22 @@ public class CardFactory implements NewConstants {
                     
                     if(choices.size() > 0) {
                         for(int i = 0; i < Tgts.length; i++) {
-                            if(Tgts[i].equals("Artifact")) {
+                            if(Tgts[i].startsWith("Artifact")) {
                                 if(CardFactoryUtil.AI_getBestArtifact(choices) != null) results.add(CardFactoryUtil.AI_getBestArtifact(choices));
-                            } else if(Tgts[i].equals("Creature")) {
+                            } else if(Tgts[i].startsWith("Creature")) {
                                 if(CardFactoryUtil.AI_getBestCreature(choices) != null) results.add(CardFactoryUtil.AI_getBestCreature(choices));
-                            } else if(Tgts[i].equals("Enchantment")) {
+                            } else if(Tgts[i].startsWith("Enchantment")) {
                                 if(CardFactoryUtil.AI_getBestEnchantment(choices, card, true) != null) results.add(CardFactoryUtil.AI_getBestEnchantment(
                                         choices, card, true));
-                            } else if(Tgts[i].equals("Land")) {
+                            } else if(Tgts[i].startsWith("Land")) {
                                 if(CardFactoryUtil.AI_getBestLand(choices) != null) results.add(CardFactoryUtil.AI_getBestLand(choices));
-                            } else if(Tgts[i].equals("Permanent")) {
+                            } else if(Tgts[i].startsWith("Permanent")) {
                                 if(CardFactoryUtil.AI_getMostExpensivePermanent(choices, card, true) != null) results.add(CardFactoryUtil.AI_getMostExpensivePermanent(
                                         choices, card, true));
                             }
                         }
                     }
-                    
+
                     if(results.size() > 0) {
                         results.shuffle();
                         setTargetCard(results.get(0));
@@ -6197,7 +6197,8 @@ public class CardFactory implements NewConstants {
             
             card.setSVar("PlayMain1", "TRUE");
         }//*************** END ************ END **************************
-        
+
+/* Converted to keyword     
         //*************** START *********** START **************************
         else if(cardName.equals("Unmake")) {
             SpellAbility spell = new Spell(card) {
@@ -6236,7 +6237,7 @@ public class CardFactory implements NewConstants {
             card.clearSpellAbility();
             card.addSpellAbility(spell);
         }//*************** END ************ END **************************
-        
+*/        
 
         //*************** START *********** START **************************
         else if(cardName.equals("Crib Swap")) {
@@ -17476,7 +17477,8 @@ public class CardFactory implements NewConstants {
             ability.setStackDescription(card + " - take an extra turn after this one.");
             ability.setDescription("Tap: Take an extra turn after this one.");
         }//*************** END ************ END **************************
-        
+
+/* Converted to keyword 
         //*************** START *********** START **************************
         if(cardName.equals("Celestial Purge")) {
             final Spell spell = new Spell(card) {
@@ -17560,7 +17562,7 @@ public class CardFactory implements NewConstants {
             card.clearSpellAbility();
             card.addSpellAbility(spell);
         }//*************** END ************ END **************************
-        
+*/        
 
         //*************** START *********** START **************************
         else if(cardName.equals("Millstone")) {
diff --git a/src/forge/CardList.java b/src/forge/CardList.java
index 6e8e0a607b4..5f3e34f5096 100644
--- a/src/forge/CardList.java
+++ b/src/forge/CardList.java
@@ -229,7 +229,7 @@ public class CardList implements Iterable<Card> {
             String incR[] = Restrictions[i].split("\\."); // Inclusive restrictions are Card types
             
             if(!incR[0].equals("Permanent")) // Since the cards don't actually say "Permanent"
-            tmpList = getType(incR[0]);
+            tmpList = getType(incR[0]); else tmpList = new CardList(toArray());
             
             if(incR.length > 1) {
                 final String excR = incR[1];