diff --git a/mods/homedecor_bathroom/init.lua b/mods/homedecor_bathroom/init.lua
index 4acbc2fa..20e18ae2 100644
--- a/mods/homedecor_bathroom/init.lua
+++ b/mods/homedecor_bathroom/init.lua
@@ -239,9 +239,7 @@ local function taps_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
 	local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z})
 	if below and
 	  below.name == "homedecor:shower_tray" or
-	  below.name == "homedecor:sink" or
-	  below.name == "homedecor:kitchen_cabinet_with_sink" or
-	  below.name == "homedecor:kitchen_cabinet_with_sink_locked" then
+	  string.find(below.name, "homedecor:.*sink") then
 		local particledef = {
 			outlet      = { x = 0, y = -0.44, z = 0.28 },
 			velocity_x  = { min = -0.1, max = 0.1 },
diff --git a/mods/homedecor_kitchen/init.lua b/mods/homedecor_kitchen/init.lua
index d4d7303c..8b9ee66a 100644
--- a/mods/homedecor_kitchen/init.lua
+++ b/mods/homedecor_kitchen/init.lua
@@ -154,6 +154,7 @@ homedecor.kitchen_convert_nodes = {}
 for _, mat in ipairs(counter_materials) do
 
 	local desc = S("Kitchen Cabinet")
+	local desc2 = S("Kitchen Cabinet with drawers")
 	local material = ""
 
 	if mat ~= "" then
@@ -240,7 +241,6 @@ for _, mat in ipairs(counter_materials) do
 		paramtype2 = "wallmounted",
 		palette = "unifieddyes_palette_colorwallmounted.png",
 		airbrush_replacement_node = "homedecor:kitchen_cabinet_colored_with_drawers"..material,
-		place_param2 = 0,
 		groups = { snappy = 3, ud_param2_colorable = 1},
 		sounds = default.node_sound_wood_defaults(),
 		infotext=S("Kitchen Cabinet with drawers"),
@@ -469,10 +469,7 @@ homedecor.register("kitchen_faucet", {
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z})
-		if below and
-		  below.name == "homedecor:sink" or
-		  below.name == "homedecor:kitchen_cabinet_with_sink" or
-		  below.name == "homedecor:kitchen_cabinet_with_sink_locked" then
+		if below and string.find(below.name, "homedecor:.*sink") then
 			local particledef = {
 				outlet      = { x = 0, y = -0.19, z = 0.13 },
 				velocity_x  = { min = -0.05, max = 0.05 },