diff --git a/mappings/on_init.jsonata b/mappings/on_init.jsonata
index fcebf125b1fce13aaab5ecef8fb4d11621300fa5..15744c506c9c3d5be5c15de5c7b887f35abcdb29 100644
--- a/mappings/on_init.jsonata
+++ b/mappings/on_init.jsonata
@@ -60,7 +60,7 @@
                 "payments": message.order.payments,
                 "cancellation_terms": message.order.cancellation_terms,
 
-                "tags": tags.{
+                "tags": message.order.tags.{
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
diff --git a/mappings/on_select.jsonata b/mappings/on_select.jsonata
index c04a3f19212a84ea6b94768077abc0ce4514a5a6..a3c219ffc82846fd563d54b0dec5cfc9d12a9748 100644
--- a/mappings/on_select.jsonata
+++ b/mappings/on_select.jsonata
@@ -59,7 +59,7 @@
                 "payments": message.order.payments,
                 "cancellation_terms": message.order.cancellation_terms,
 
-                "tags": tags.{
+                "tags": message.order.tags.{
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,