diff --git a/mappings/on_cancel.jsonata b/mappings/on_cancel.jsonata
index 3ce616b264fcfd405245806d0edec09be59406a6..a95554e2e9d104bbadcb1c2d73aefe03754a122d 100644
--- a/mappings/on_cancel.jsonata
+++ b/mappings/on_cancel.jsonata
@@ -28,7 +28,13 @@
                     "rating": rating,
                     "rateable": rateable,
                     "time": time,
-                    "quantity": quantity
+                    "quantity": quantity,
+                     "tags": tags.{
+                        "code": descriptor.code,
+                        "name": descriptor.name,
+                        "display": display,
+                        "list": list.{ "code": code, "name": name, "value": value }[]
+                    }[]
                 }[],
                 "fulfillments": message.order.fulfillments,
                 "quote": message.order.quote,
diff --git a/mappings/on_confirm.jsonata b/mappings/on_confirm.jsonata
index ebeb26e63b4bcd38f554f41332f4eb2abecc993d..d93342d17e9875b7a2837f80ab8bf0389bec9499 100644
--- a/mappings/on_confirm.jsonata
+++ b/mappings/on_confirm.jsonata
@@ -47,7 +47,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
+                        "list": list.{ "code": code, "name": name, "value": value }[]
                     }[]
             }[],
                 "fulfillments": message.order.fulfillments,
@@ -60,7 +60,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
+                        "list": list.{ "code": code, "name": name, "value": value }[]
                     }[]
         }
     }[]
diff --git a/mappings/on_init.jsonata b/mappings/on_init.jsonata
index 32fa599fb992bd052a1aa61960916e3e207a95ba..180b990fd33952a40cf77ea715f5756b7d827b85 100644
--- a/mappings/on_init.jsonata
+++ b/mappings/on_init.jsonata
@@ -50,7 +50,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
+                        "list": list.{ "code": code, "name": name, "value": value }[]
                     }[],
                     "xinput":$xInput(xinput, $action)
                 }[],
@@ -65,7 +65,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
+                        "list": list.{ "code": code, "name": name, "value": value }[]
                     }[]
             }
         }
diff --git a/mappings/on_search.jsonata b/mappings/on_search.jsonata
index 2ff750eda1bcd5b8b062341ffb470ece7230fe0a..5351af028ae3ca529e8900fee10e6895dd3429f7 100644
--- a/mappings/on_search.jsonata
+++ b/mappings/on_search.jsonata
@@ -74,7 +74,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
+                        "list": list.{ "code": code, "name": name, "value": value }[]
                     }[],
                     "time": {
                         "duration": time.duration,
diff --git a/mappings/on_select.jsonata b/mappings/on_select.jsonata
index af70dd3d107c9eef0907f0ccbe8a0162e2562d50..df96111ad3920344a52a5746fb30c535a821c37e 100644
--- a/mappings/on_select.jsonata
+++ b/mappings/on_select.jsonata
@@ -52,7 +52,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ "code": descriptor.code, "name": descriptor.name, "value": value }[]
+                        "list": list.{ "code": code, "name": name, "value": value }[]
                     }[]
                 }[],
                 "fulfillments": message.order.fulfillments,
diff --git a/mappings/on_status.jsonata b/mappings/on_status.jsonata
index 6cd46a981404e81fa6ea5dff29e66de66ce30276..850575aae922960e6daf3d2fb2cdcd73281cfa6c 100644
--- a/mappings/on_status.jsonata
+++ b/mappings/on_status.jsonata
@@ -55,10 +55,7 @@
                         "code": descriptor.code,
                         "name": descriptor.name,
                         "display": display,
-                        "list": list.{ 
-                        "code": descriptor.code, 
-                        "name": descriptor.name, 
-                        "value": value }[]
+                        "list": list.{ "code": code, "name": name, "value": value }[]
                     }[]
               }[],
                 "fulfillments": message.order.fulfillments,