diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index fabc29a..2d4e5d0 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
     ci-cd:
-      uses: CBIIT/bento-workflows/.github/workflows/ci-cd.yml@v2.2.9
+      uses: CBIIT/bento-workflows/.github/workflows/ci-cd.yml@v2.2.10
       with:
         workdir: ./python
         pkg_name: bento-meta
diff --git a/python/scripts/make_mapping_changelog.py b/python/scripts/make_mapping_changelog.py
index 5d53f9e..cb20075 100644
--- a/python/scripts/make_mapping_changelog.py
+++ b/python/scripts/make_mapping_changelog.py
@@ -125,7 +125,7 @@ def generate_mapping_cypher(
         T(
             _plain_var(src_concept),
             R(Type="has_tag"),
-            N(label="tag", props={"mapping_source": mapping_source}),
+            N(label="tag", props={"key": "mapping_source", "value": mapping_source}),
         ),
     )
     dst_concept_path = G(
@@ -133,12 +133,13 @@ def generate_mapping_cypher(
         T(
             _plain_var(dst_concept),
             R(Type="has_tag"),
-            N(label="tag", props={"mapping_source": mapping_source}),
+            N(label="tag", props={"key": "mapping_source", "value": mapping_source}),
         ),
     )
     new_concept = N(label="concept", props={"_commit": _commit})
     new_tag = N(
-        label="tag", props={"mapping_source": mapping_source, "_commit": _commit}
+        label="tag",
+        props={"key": "mapping_source", "value": mapping_source, "_commit": _commit},
     )
     return Statement(
         # find src & dst entities using parent triples
diff --git a/python/scripts/make_model_changelog.py b/python/scripts/make_model_changelog.py
index bd224fe..49fdadf 100644
--- a/python/scripts/make_model_changelog.py
+++ b/python/scripts/make_model_changelog.py
@@ -87,7 +87,7 @@ def generate_cypher_to_add_entity(
     """Generates cypher statement to create or merge Entity."""
     if entity in cypher_stmts["added_entities"]:
         return
-    # escape_quotes_in_attr(entity)
+    escape_quotes_in_attr(entity)
     cypher_ent = cypherize_entity(entity)
     if isinstance(entity, (Term, ValueSet)):
         if "_commit" not in cypher_ent.props: