diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
index d1b0dce98c..26703beeef 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
@@ -169,6 +169,7 @@ public class AdminGeodata implements IAdminCommandHandler
 				{
 					activeChar.sendMessage("NPC " + id + " does not have a default html.");
 				}
+				activeChar.sendMessage("Found " + results.size() + " results.");
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/cache/HtmCache.java
index c7f7c3b970..99ab8ee627 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/cache/HtmCache.java
@@ -187,9 +187,16 @@ public class HtmCache
 	 */
 	public boolean htmlNameExists(String search)
 	{
+		for (String s : _cache.keySet())
+		{
+			if (s.contains(search) && (!s.contains("quest")))
+			{
+				return true;
+			}
+		}
 		for (String s : _cache.values())
 		{
-			if (s.contains(search))
+			if (s.contains(search) && (!s.contains("quest")))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
index d1b0dce98c..26703beeef 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
@@ -169,6 +169,7 @@ public class AdminGeodata implements IAdminCommandHandler
 				{
 					activeChar.sendMessage("NPC " + id + " does not have a default html.");
 				}
+				activeChar.sendMessage("Found " + results.size() + " results.");
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java
index db8c974e26..99ab8ee627 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/cache/HtmCache.java
@@ -189,7 +189,14 @@ public class HtmCache
 	{
 		for (String s : _cache.keySet())
 		{
-			if (s.contains(search))
+			if (s.contains(search) && (!s.contains("quest")))
+			{
+				return true;
+			}
+		}
+		for (String s : _cache.values())
+		{
+			if (s.contains(search) && (!s.contains("quest")))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
index d1b0dce98c..26703beeef 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java
@@ -169,6 +169,7 @@ public class AdminGeodata implements IAdminCommandHandler
 				{
 					activeChar.sendMessage("NPC " + id + " does not have a default html.");
 				}
+				activeChar.sendMessage("Found " + results.size() + " results.");
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java
index db8c974e26..99ab8ee627 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/cache/HtmCache.java
@@ -189,7 +189,14 @@ public class HtmCache
 	{
 		for (String s : _cache.keySet())
 		{
-			if (s.contains(search))
+			if (s.contains(search) && (!s.contains("quest")))
+			{
+				return true;
+			}
+		}
+		for (String s : _cache.values())
+		{
+			if (s.contains(search) && (!s.contains("quest")))
 			{
 				return true;
 			}