diff --git a/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_if_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_if_item.mcfunction
index 45e4e8ab..c037f174 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_if_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_if_item.mcfunction
@@ -1,2 +1,2 @@
-$execute as @a at @s if items entity @e[type=minecraft:chest_minecart,distance=..2,limit=1,tag=$(tag)] container.$(slot) *[minecraft:custom_data=$(customData)] run $(invoke)
+$execute as @a[name=$(player),limit=1] at @s if items entity @e[type=minecraft:chest_minecart,distance=..2,limit=1,tag=$(tag)] container.$(slot) $(item)[minecraft:custom_data=$(customData)] run $(invoke)
 $tellraw @a[tag=datalib.debug] ["",{"text":"[DL] ","color":"#00AAAA","bold":true},{"text":"inv/chest_minecart_if_item ","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(tag)","color":"aqua"}]
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_unless_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_unless_item.mcfunction
index 55665e0d..94c2340a 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_unless_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/chest_minecart_unless_item.mcfunction
@@ -1,2 +1,2 @@
-$execute as @a at @s unless items entity @e[type=minecraft:chest_minecart,distance=..2,limit=1,tag=$(tag)] container.$(slot) *[minecraft:custom_data=$(customData)] run $(invoke)
+$execute as @a[name=$(player),limit=1] at @s unless items entity @e[type=minecraft:chest_minecart,distance=..2,limit=1,tag=$(tag)] container.$(slot) $(item)[minecraft:custom_data=$(customData)] run $(invoke)
 $tellraw @a[tag=datalib.debug] ["",{"text":"[DL] ","color":"#00AAAA","bold":true},{"text":"inv/chest_minecart_unless_item ","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(tag)","color":"aqua"}]
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/clear_custom.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/clear_custom.mcfunction
index ebf7681a..8b9932d5 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/clear_custom.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/clear_custom.mcfunction
@@ -1,2 +1,2 @@
-$execute as @a[name=$(player),limit=1] run clear @s *[minecraft:custom_data=$(customData)] $(count)
+$execute as @a[name=$(player),limit=1] run clear @s $(item)[minecraft:custom_data=$(customData)] $(count)
 $tellraw @a[tag=datalib.debug] ["",{"text":"[DL] ","color":"#00AAAA","bold":true},{"text":"inv/clear_custom ","color":"aqua"},{"text":"$(player)","color":"white"}]
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/cursor_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/cursor_item.mcfunction
index cd85d733..88fc1fa5 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/cursor_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/cursor_item.mcfunction
@@ -1,8 +1,2 @@
 # Detect click (slot empty after interaction)
-$execute as @a at @s if items entity @s player.cursor *[minecraft:custom_data=$(data)] run $(invoke)
-
-# Restore item
-$item replace entity @e[type=chest_minecart,tag=$(id),limit=1,sort=nearest] container.$(slot) with $(item)[minecraft:custom_data=$(data)] $(count)
-
-# Clear cursor
-$clear @s $(item)[minecraft:custom_data=$(data)] $(count)
+$execute as @a[name=$(player),limit=1] at @s if items entity @s player.cursor $(item)[minecraft:custom_data=$(data)] run $(invoke)
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/offhand_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/offhand_item.mcfunction
index 2b4847fb..eaa1cd51 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/offhand_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/offhand_item.mcfunction
@@ -12,4 +12,4 @@
 # function datalib:player/inv/offhand_item {item:"minecraft:shield",customData:"{my_tag:1b}",invoke:"function mypack:on_shield"}
 # ─────────────────────────────────────────────────────────────────
 
-$execute as @a at @s if items entity @s weapon.offhand $(item)[minecraft:custom_data=$(customData)] run $(invoke)
+$execute as @a[name=$(player),limit=1] at @s if items entity @s weapon.offhand $(item)[minecraft:custom_data=$(customData)] run $(invoke)
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/player_if_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/player_if_item.mcfunction
index a8963208..b472da2c 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/player_if_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/player_if_item.mcfunction
@@ -1,2 +1,2 @@
-$execute as @a[name=$(player),limit=1] at @s if items entity @s *.* *[minecraft:custom_data=$(customData)] run $(invoke)
+$execute as @a[name=$(player),limit=1] at @s if items entity @s contents $(item)[minecraft:custom_data=$(customData)] run $(invoke)
 $tellraw @a[tag=datalib.debug] ["",{"text":"[DL] ","color":"#00AAAA","bold":true},{"text":"inv/player_if_item ","color":"aqua"},{"text":"$(player)","color":"white"}]
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/player_slot_if_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/player_slot_if_item.mcfunction
index 2a1cca6e..b3772cb5 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/player_slot_if_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/player_slot_if_item.mcfunction
@@ -1,2 +1,2 @@
-$execute as @a[name=$(player),limit=1] at @s if items entity @s $(slot) *[minecraft:custom_data=$(customData)] run $(invoke)
+$execute as @a[name=$(player),limit=1] at @s if items entity @s $(slot) $(item)[minecraft:custom_data=$(customData)] run $(invoke)
 $tellraw @a[tag=datalib.debug] ["",{"text":"[DL] ","color":"#00AAAA","bold":true},{"text":"inv/player_slot_if_item ","color":"aqua"},{"text":"$(player)","color":"white"}]
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/player_unless_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/player_unless_item.mcfunction
index f79286d8..b29e8674 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/player_unless_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/player_unless_item.mcfunction
@@ -1,2 +1,2 @@
-$execute as @a[name=$(player),limit=1] at @s unless items entity @s *.* *[minecraft:custom_data=$(customData)] run $(invoke)
+$execute as @a[name=$(player),limit=1] at @s unless items entity @s contents $(item)[minecraft:custom_data=$(customData)] run $(invoke)
 $tellraw @a[tag=datalib.debug] ["",{"text":"[DL] ","color":"#00AAAA","bold":true},{"text":"inv/player_unless_item ","color":"aqua"},{"text":"$(player)","color":"white"}]
diff --git a/datapacks/dataLib/data/datalib/function/player/inv/selected_item.mcfunction b/datapacks/dataLib/data/datalib/function/player/inv/selected_item.mcfunction
index e977a436..574f39a7 100644
--- a/datapacks/dataLib/data/datalib/function/player/inv/selected_item.mcfunction
+++ b/datapacks/dataLib/data/datalib/function/player/inv/selected_item.mcfunction
@@ -1 +1 @@
-$execute as @a at @s if items entity @s weapon.mainhand $(item)[minecraft:custom_data=$(customData)] run $(invoke)
+$execute as @a[name=$(player),limit=1] as @a at @s if items entity @s weapon.mainhand $(item)[minecraft:custom_data=$(customData)] run $(invoke)