diff --git a/src/ifcsverchok/nodes/ifc/create_file.py b/src/ifcsverchok/nodes/ifc/create_file.py
index 4e6c24de69..41aab59da3 100644
--- a/src/ifcsverchok/nodes/ifc/create_file.py
+++ b/src/ifcsverchok/nodes/ifc/create_file.py
@@ -30,9 +30,7 @@ class SvIfcCreateFile(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper.S
         self.outputs.new("SvVerticesSocket", "file")
 
     def draw_buttons(self, context, layout):
-        op = layout.operator("node.sv_ifc_create_file_refresh", icon="FILE_REFRESH", text="Refresh")
-        op.tree_name = self.id_data.name
-        op.node_name = self.name
+        self.wrapper_tracked_ui_draw_op(layout, "node.sv_ifc_create_file_refresh", icon="FILE_REFRESH", text="Refresh")
 
     def process(self):
         self.sv_input_names = ["schema"]
diff --git a/src/ifcsverchok/nodes/ifc/create_shape.py b/src/ifcsverchok/nodes/ifc/create_shape.py
index 6ce2486dba..6d0a4a2f92 100644
--- a/src/ifcsverchok/nodes/ifc/create_shape.py
+++ b/src/ifcsverchok/nodes/ifc/create_shape.py
@@ -33,9 +33,7 @@ class SvIfcCreateShape(bpy.types.Node, SverchCustomTreeNode, ifcsverchok.helper.
         self.inputs.new("SvStringsSocket", "entity").prop_name = "entity"
 
     def draw_buttons(self, context, layout):
-        op = layout.operator("node.sv_ifc_create_shape_refresh", icon="FILE_REFRESH", text="Refresh")
-        op.tree_name = self.id_data.name
-        op.node_name = self.name
+        self.wrapper_tracked_ui_draw_op(layout, "node.sv_ifc_create_shape_refresh", icon="FILE_REFRESH", text="Refresh")
 
     def process(self):
         self.sv_input_names = ["file", "entity"]
diff --git a/src/ifcsverchok/nodes/ifc/select_blender_objects.py b/src/ifcsverchok/nodes/ifc/select_blender_objects.py
index ade7c25498..77e491c85c 100644
--- a/src/ifcsverchok/nodes/ifc/select_blender_objects.py
+++ b/src/ifcsverchok/nodes/ifc/select_blender_objects.py
@@ -32,9 +32,9 @@ class SvIfcSelectBlenderObjects(bpy.types.Node, SverchCustomTreeNode, ifcsvercho
         self.inputs.new("SvStringsSocket", "entities").prop_name = "entities"
 
     def draw_buttons(self, context, layout):
-        op = layout.operator("node.sv_ifc_select_blender_objects_refresh", icon="FILE_REFRESH", text="Refresh")
-        op.tree_name = self.id_data.name
-        op.node_name = self.name
+        self.wrapper_tracked_ui_draw_op(
+            layout, "node.sv_ifc_select_blender_objects_refresh", icon="FILE_REFRESH", text="Refresh"
+        )
 
     def process(self):
         self.file = IfcStore.get_file()