diff --git a/goblin_coal.lua b/goblin_coal.lua
index f610cf9..4c29316 100644
--- a/goblin_coal.lua
+++ b/goblin_coal.lua
@@ -113,7 +113,7 @@ mobs:register_mob("fun_caves:goblin_coal", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone"}, "fun_caves:stone_with_coal_trap")
 
 		fun_caves.surface_damage(self)
diff --git a/goblin_cobbler.lua b/goblin_cobbler.lua
index 47d1f52..5fe2e5d 100644
--- a/goblin_cobbler.lua
+++ b/goblin_cobbler.lua
@@ -117,7 +117,7 @@ mobs:register_mob("fun_caves:goblin_cobble", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone", "default:desert_stone", "default:sandstone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:mossycobble"}, "fun_caves:mossycobble_trap")
 
 		fun_caves.surface_damage(self)
diff --git a/goblin_copper.lua b/goblin_copper.lua
index e9c893b..d9a30e1 100644
--- a/goblin_copper.lua
+++ b/goblin_copper.lua
@@ -113,7 +113,7 @@ mobs:register_mob("fun_caves:goblin_copper", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone"}, "fun_caves:stone_with_copper_trap")
 
 		fun_caves.surface_damage(self)
diff --git a/goblin_diamond.lua b/goblin_diamond.lua
index 858a22a..daffe7c 100644
--- a/goblin_diamond.lua
+++ b/goblin_diamond.lua
@@ -115,7 +115,7 @@ mobs:register_mob("fun_caves:goblin_diamond", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone"}, "fun_caves:stone_with_diamond_trap")
 
 		fun_caves.surface_damage(self)
diff --git a/goblin_digger.lua b/goblin_digger.lua
index bd75ca9..fdc0571 100644
--- a/goblin_digger.lua
+++ b/goblin_digger.lua
@@ -211,7 +211,7 @@ mobs:register_mob("fun_caves:goblin_digger", {
 		goblin_tunneling(self, "digger")
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone", "default:desert_stone", "default:sandstone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:mossycobble"}, "fun_caves:mossycobble_trap")
 
 		fun_caves.surface_damage(self)
diff --git a/goblin_gold.lua b/goblin_gold.lua
index 18028e0..a9f5a31 100644
--- a/goblin_gold.lua
+++ b/goblin_gold.lua
@@ -113,7 +113,7 @@ mobs:register_mob("fun_caves:goblin_gold", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone"}, "fun_caves:stone_with_gold_trap")
 
 		fun_caves.surface_damage(self)
diff --git a/goblin_ice.lua b/goblin_ice.lua
index ed84501..371681f 100644
--- a/goblin_ice.lua
+++ b/goblin_ice.lua
@@ -112,7 +112,7 @@ mobs:register_mob("fun_caves:goblin_ice", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		--fun_caves.search_replace(self.object:getpos(), 20, {"default:stone"}, "default:mossycobble")
+		--fun_caves.search_replace(self.object:getpos(), 20, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:ice"}, "fun_caves:ice_trap")
 
 		fun_caves.surface_damage(self, true)
diff --git a/goblin_iron.lua b/goblin_iron.lua
index 0c26814..d0c1896 100644
--- a/goblin_iron.lua
+++ b/goblin_iron.lua
@@ -115,7 +115,7 @@ mobs:register_mob("fun_caves:goblin_iron", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone"}, "fun_caves:stone_with_iron_trap")
 
 		fun_caves.surface_damage(self)
diff --git a/goblin_king.lua b/goblin_king.lua
index 6f5e835..adae025 100644
--- a/goblin_king.lua
+++ b/goblin_king.lua
@@ -114,7 +114,7 @@ mobs:register_mob("fun_caves:goblin_king", {
 		end
 
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_torch_freq, {"default:torch"}, "air")
-		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:stone"}, "default:mossycobble")
+		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone", "default:sandstone"}, "default:mossycobble")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"default:mossycobble"}, "fun_caves:mossycobble_trap")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone"}, "fun_caves:stone_with_coal_trap")
 		fun_caves.search_replace(self.object:getpos(), fun_caves.goblin_trap_freq, {"group:stone"}, "fun_caves:stone_with_copper_trap")