diff --git a/mappings/on_select.jsonata b/mappings/on_select.jsonata
index 1400906e2f9d0e78d481718bdef6e282f552ca11..ddd202454d9aa934226c69269a4d2b26b8826af3 100644
--- a/mappings/on_select.jsonata
+++ b/mappings/on_select.jsonata
@@ -1,24 +1,24 @@
-$.{   
-    "context":responses.context,
+$.responses.{
+    "context": context,
     "message": {
         "order": {
-            "type": responses.message.order.type,
-            "quote": responses.message.order.quote,
+            "type": message.order.type,
+            "quote": message.order.quote,
             "provider": {
-                "id": responses.message.order.provider.id,
-                "name": responses.message.order.provider.descriptor.name,
-                "short_desc": responses.message.order.provider.descriptor.short_desc,
-                "long_desc": responses.message.order.provider.descriptor.long_desc,
-                "rating": responses.message.order.provider.rating,
-                "images": responses.message.order.provider.descriptor.images.{
+                "id": message.order.provider.id,
+                "name": message.order.provider.descriptor.name,
+                "short_desc": message.order.provider.descriptor.short_desc,
+                "long_desc": message.order.provider.descriptor.long_desc,
+                "rating": message.order.provider.rating,
+                "images": message.order.provider.descriptor.images.{
                     "url": url,
                     "size_type": size_type
                 },
-                "media": responses.message.order.provider.descriptor.media.{
+                "media": message.order.provider.descriptor.media.{
                     "url": url
                 }
             },
-            "items": responses.message.order.items.{
+            "items": message.order.items.{
                 "id": id,
                 "name": descriptor.name,
                 "short_desc": descriptor.short_desc,
@@ -54,4 +54,4 @@ $.{
             }
         }
     }
-}
+}[]