diff --git a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
index 658577f3eb6..f1e55f5faac 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ExertAbility.java
@@ -76,7 +76,7 @@ public class ExertAbility extends SimpleStaticAbility {
             ruleText += ". ";
             ability.setRuleVisible(false);
         }
-        ruleText += "<i>(An exerted creature can't untap during your next untap step)</i>";
+        ruleText += "<i>(An exerted creature won't untap during your next untap step)</i>";
         if (exertOnlyOncePerTurn) {
             getWatchers().add(new ExertedThisTurnWatcher());
         }
@@ -142,7 +142,7 @@ class ExertReplacementEffect extends ReplacementEffectImpl {
                 }
             }
             if (controller.chooseUse(outcome, "Exert " + creature.getLogName() + '?',
-                    "An exerted creature can't untap during your next untap step.", "Yes", "No", source, game)) {
+                    "An exerted creature won't untap during your next untap step.", "Yes", "No", source, game)) {
                 if (!game.isSimulation()) {
                     game.informPlayers(controller.getLogName() + " exerted " + creature.getName());
                 }
diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java
index ecaa41e6418..6f4984d0880 100644
--- a/Mage/src/main/java/mage/constants/SubType.java
+++ b/Mage/src/main/java/mage/constants/SubType.java
@@ -97,7 +97,7 @@ public enum SubType {
     DRONE("Drone", SubTypeSet.CreatureType, false),
     DRUID("Druid", SubTypeSet.CreatureType, false),
     DROID("Droid", SubTypeSet.CreatureType, true),
-    DRYAD("Dryad", SubTypeSet.CreatureType, true),
+    DRYAD("Dryad", SubTypeSet.CreatureType, false),
     DWARF("Dwarf", SubTypeSet.CreatureType, false),
 
     EFREET("Efreet", SubTypeSet.CreatureType, false),
@@ -152,20 +152,20 @@ public enum SubType {
     INSECT("Insect", SubTypeSet.CreatureType, false),
 
     JEDI("Jedi", SubTypeSet.CreatureType, true),
-    JELLYFISH("Jellyfish", SubTypeSet.CreatureType, true),
-    JUGGERNAUT("Juggernaut", SubTypeSet.CreatureType, true),
+    JELLYFISH("Jellyfish", SubTypeSet.CreatureType, false),
+    JUGGERNAUT("Juggernaut", SubTypeSet.CreatureType, false),
 
-    KAVU("Kavu", SubTypeSet.CreatureType, true),
-    KIRIN("Kirin", SubTypeSet.CreatureType, true),
+    KAVU("Kavu", SubTypeSet.CreatureType, false),
+    KIRIN("Kirin", SubTypeSet.CreatureType, false),
     KITHKIN("Kithkin", SubTypeSet.CreatureType, false),
     KNIGHT("Knight", SubTypeSet.CreatureType, false),
     KOBOLD("Kobold", SubTypeSet.CreatureType, false),
     KOR("Kor", SubTypeSet.CreatureType, false),
     KRAKEN("Kraken", SubTypeSet.CreatureType, false),
 
-    LAMIA("Lamia", SubTypeSet.CreatureType, true),
-    LAMMASU("Lammasu", SubTypeSet.CreatureType, true),
-    LEECH("Leech", SubTypeSet.CreatureType, true),
+    LAMIA("Lamia", SubTypeSet.CreatureType, false),
+    LAMMASU("Lammasu", SubTypeSet.CreatureType, false),
+    LEECH("Leech", SubTypeSet.CreatureType, false),
     LEVIATHAN("Leviathan", SubTypeSet.CreatureType, false),
     LHURGOYF("Lhurgoyf", SubTypeSet.CreatureType, false),
     LICID("Licid", SubTypeSet.CreatureType, false),
@@ -379,5 +379,9 @@ public enum SubType {
     public static Set<String> getBasicLands(boolean customSet) {
         return Arrays.stream(values()).filter(s -> s.customSet == customSet).filter(p -> p.getSubTypeSet() == SubTypeSet.BasicLandType).map(SubType::getDescription).collect(Collectors.toSet());
     }
+
+    public static Set<String> getLandTypes(boolean customSet){
+        return Arrays.stream(values()).filter(s->s.customSet==customSet).filter(p->p.getSubTypeSet() == SubTypeSet.BasicLandType || p.getSubTypeSet() == SubTypeSet.NonBasicLandType).map(SubType::getDescription).collect(Collectors.toSet());
+    }
 }