diff --git a/openpype/hosts/hiero/api/tags.py b/openpype/hosts/hiero/api/tags.py
index d2502f3c71..5015f3dfea 100644
--- a/openpype/hosts/hiero/api/tags.py
+++ b/openpype/hosts/hiero/api/tags.py
@@ -78,8 +78,7 @@ def update_tag(tag, data):
     # set icon if any available in input data
     if data.get("icon"):
         tag.setIcon(str(data["icon"]))
-    # set note description of tag
-    tag.setNote(data["note"])
+
     # get metadata of tag
     mtd = tag.metadata()
     # get metadata key from data
@@ -97,6 +96,9 @@ def update_tag(tag, data):
             "tag.{}".format(str(k)),
             str(v)
         )
+
+    # set note description of tag
+    tag.setNote(str(data["note"]))
     return tag
 
 
@@ -106,6 +108,26 @@ def add_tags_to_workfile():
     """
     from .lib import get_current_project
 
+    def add_tag_to_bin(root_bin, name, data):
+        # for Tags to be created in root level Bin
+        # at first check if any of input data tag is not already created
+        done_tag = next((t for t in root_bin.items()
+                        if str(name) in t.name()), None)
+
+        if not done_tag:
+            # create Tag
+            tag = create_tag(name, data)
+            tag.setName(str(name))
+
+            log.debug("__ creating tag: {}".format(tag))
+            # adding Tag to Root Bin
+            root_bin.addItem(tag)
+        else:
+            # update only non hierarchy tags
+            update_tag(done_tag, data)
+            done_tag.setName(str(name))
+            log.debug("__ updating tag: {}".format(done_tag))
+
     # get project and root bin object
     project = get_current_project()
     root_bin = project.tagsBin()
@@ -125,10 +147,8 @@ def add_tags_to_workfile():
     for task_type in tasks.keys():
         nks_pres_tags["[Tasks]"][task_type.lower()] = {
             "editable": "1",
-            "note": "",
-            "icon": {
-                "path": "icons:TagGood.png"
-            },
+            "note": task_type,
+            "icon": "icons:TagGood.png",
             "metadata": {
                 "family": "task",
                 "type": task_type
@@ -157,10 +177,10 @@ def add_tags_to_workfile():
         # check if key is not decorated with [] so it is defined as bin
         bin_find = None
         pattern = re.compile(r"\[(.*)\]")
-        bin_finds = pattern.findall(_k)
+        _bin_finds = pattern.findall(_k)
         # if there is available any then pop it to string
-        if bin_finds:
-            bin_find = bin_finds.pop()
+        if _bin_finds:
+            bin_find = _bin_finds.pop()
 
         # if bin was found then create or update
         if bin_find:
@@ -168,7 +188,6 @@ def add_tags_to_workfile():
             # first check if in root lever is not already created bins
             bins = [b for b in root_bin.items()
                     if b.name() in str(bin_find)]
-            log.debug(">>> bins: {}".format(bins))
 
             if bins:
                 bin = bins.pop()
@@ -178,49 +197,14 @@ def add_tags_to_workfile():
                 bin = hiero.core.Bin(str(bin_find))
 
             # update or create tags in the bin
-            for k, v in _val.items():
-                tags = [t for t in bin.items()
-                        if str(k) in t.name()
-                        if len(str(k)) == len(t.name())]
-                if not tags:
-                    # create Tag obj
-                    tag = create_tag(k, v)
-
-                    # adding Tag to Bin
-                    bin.addItem(tag)
-                else:
-                    update_tag(tags.pop(), v)
+            for __k, __v in _val.items():
+                add_tag_to_bin(bin, __k, __v)
 
             # finally add the Bin object to the root level Bin
             if root_add:
                 # adding Tag to Root Bin
                 root_bin.addItem(bin)
         else:
-            # for Tags to be created in root level Bin
-            # at first check if any of input data tag is not already created
-            tags = None
-            tags = [t for t in root_bin.items()
-                    if str(_k) in t.name()]
-
-            if not tags:
-                # create Tag
-                tag = create_tag(_k, _val)
-
-                # adding Tag to Root Bin
-                root_bin.addItem(tag)
-            else:
-                # update Tags if they already exists
-                for _t in tags:
-                    # skip bin objects
-                    if isinstance(_t, hiero.core.Bin):
-                        continue
-
-                    # check if Hierarchy in name and skip it
-                    # because hierarchy could be edited
-                    if "hierarchy" in _t.name().lower():
-                        continue
-
-                    # update only non hierarchy tags
-                    update_tag(_t, _val)
+            add_tag_to_bin(root_bin, _k, _val)
 
     log.info("Default Tags were set...")