diff --git a/Authentication/bg/cognitive-flow.json b/Authentication/bg/cognitive-flow.json
index 1df8f47..fe6ecd8 100644
--- a/Authentication/bg/cognitive-flow.json
+++ b/Authentication/bg/cognitive-flow.json
@@ -153,7 +153,7 @@
                   "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctors",
                   "selector": "$[:].ExternalId"
                 },
-                "condition": "{{$in _raw.doctor.ExternalId _response}}"
+                "condition": "{{$in doctor.ExternalId _response}}"
               },
               "error-message": [
                 "За съжаление, {{doctor}} няма свободни часове за момента."
@@ -180,7 +180,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
                   "method": "GET"
                 },
                 "condition": "{{$in ($date date 'YYYY-MM-DD') _response}}"
@@ -193,7 +193,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
               "method": "GET"
             }
           }
@@ -210,7 +210,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
                   "method": "GET"
                 },
                 "condition": "{{$in time _response}}"
@@ -223,7 +223,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
               "method": "GET"
             }
           }
@@ -282,7 +282,7 @@
               "Authorization": "Bearer {{auth.accessToken}}"
             },
             "payload": {
-              "DoctorID": "{{_raw.doctor.ExternalId}}",
+              "DoctorID": "{{doctor.ExternalId}}",
               "PatientName": "{{contactName}}",
               "Date": "{{date}}",
               "Time": "{{time}}"
diff --git a/Authentication/en/cognitive-flow.json b/Authentication/en/cognitive-flow.json
index 30a4234..f11a6a0 100644
--- a/Authentication/en/cognitive-flow.json
+++ b/Authentication/en/cognitive-flow.json
@@ -153,7 +153,7 @@
                   "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctors",
                   "selector": "$[:].ExternalId"
                 },
-                "condition": "{{$in _raw.doctor.ExternalId _response}}"
+                "condition": "{{$in doctor.ExternalId _response}}"
               },
               "error-message": [
                 "Unfortunately, {{doctor}} is not available."
@@ -181,7 +181,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
                   "method": "GET"
                 },
                 "condition": "{{$in ($date date 'YYYY-MM-DD') _response}}"
@@ -194,7 +194,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
               "method": "GET"
             }
           }
@@ -211,7 +211,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
                   "method": "GET"
                 },
                 "condition": "{{$in time _response}}"
@@ -224,7 +224,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
               "method": "GET"
             }
           }
@@ -284,7 +284,7 @@
               "Authorization": "Bearer {{auth.accessToken}}"
             },
             "payload": {
-              "DoctorID": "{{_raw.doctor.ExternalId}}",
+              "DoctorID": "{{doctor.ExternalId}}",
               "PatientName": "{{contactName}}",
               "Date": "{{date}}",
               "Time": "{{time}}"
diff --git a/InsuranceAgent/en/cognitive-flow.json b/InsuranceAgent/en/cognitive-flow.json
index b614194..04a31ec 100644
--- a/InsuranceAgent/en/cognitive-flow.json
+++ b/InsuranceAgent/en/cognitive-flow.json
@@ -168,7 +168,7 @@
                 {
                   "type": "custom",
                   "parameters": {
-                    "condition": "{{$gt _raw.endDate _raw.startDate}}"
+                    "condition": "{{$gt endDate startDate}}"
                   },
                   "error-message": [
                     "The end date of your insurance cannot be before your start date."
@@ -245,7 +245,7 @@
             "display": {
               "type": "carousel",
               "data-source": {
-                "endpoint": "https://api.everlive.com/v1/2mjhvesaxbgg0qiu/Functions/recommendInsurances?startDate={{_raw.startDate}}&endDate={{_raw.endDate}}",
+                "endpoint": "https://api.everlive.com/v1/2mjhvesaxbgg0qiu/Functions/recommendInsurances?startDate={{startDate}}&endDate={{endDate}}",
                 "method": "GET"
               },
               "template": {
@@ -261,7 +261,7 @@
             "type": "webhook",
             "entity": "insurance",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/2mjhvesaxbgg0qiu/Functions/recommendInsurance?startDate={{startDate}}&endDate={{endDate}}&id={{_raw.insurancePlan.Id}}",
+              "endpoint": "https://api.everlive.com/v1/2mjhvesaxbgg0qiu/Functions/recommendInsurance?startDate={{startDate}}&endDate={{endDate}}&id={{insurancePlan.Id}}",
               "method": "GET"
             }
           },
@@ -460,7 +460,7 @@
                 {
                   "type": "image",
                   "error-message": [
-                    "Even though I enjoy {{_raw.receiptPicture.labels.[0]}} pictures, we'll need a photo with the invoice of the billed ammount."
+                    "Even though I enjoy {{receiptPicture.labels.[0]}} pictures, we'll need a photo with the invoice of the billed ammount."
                   ],
                   "parameters": {
                     "contains": [
diff --git a/QuickStart/bg/cognitive-flow.json b/QuickStart/bg/cognitive-flow.json
index 195b240..9b654b8 100644
--- a/QuickStart/bg/cognitive-flow.json
+++ b/QuickStart/bg/cognitive-flow.json
@@ -142,7 +142,7 @@
                     "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctors",
                     "selector": "$[:].ExternalId"
                   },
-                  "condition": "{{$in _raw.doctor.ExternalId _response}}"
+                  "condition": "{{$in doctor.ExternalId _response}}"
                 },
                 "error-message": [
                   "За съжаление, {{doctor}} няма свободни часове за момента."
@@ -170,7 +170,7 @@
                 "type": "custom",
                 "parameters": {
                   "data-source": {
-                    "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+                    "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
                     "method": "GET"
                   },
                   "condition": "{{$in ($date date 'YYYY-MM-DD') _response}}"
@@ -184,7 +184,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
               "method": "GET"
             }
           }
@@ -202,7 +202,7 @@
                 "type": "custom",
                 "parameters": {
                   "data-source": {
-                    "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+                    "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
                     "method": "GET"
                   },
                   "condition": "{{$in time _response}}"
@@ -216,7 +216,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
               "method": "GET"
             }
           }
@@ -276,7 +276,7 @@
               "Content-Type": "application/json"
             },
             "payload": {
-              "DoctorID": "{{_raw.doctor.ExternalId}}",
+              "DoctorID": "{{doctor.ExternalId}}",
               "PatientName": "{{contactName}}",
               "Date": "{{date}}",
               "Time": "{{time}}"
diff --git a/QuickStart/de/cognitive-flow.json b/QuickStart/de/cognitive-flow.json
index e1a4e21..de9d58f 100644
--- a/QuickStart/de/cognitive-flow.json
+++ b/QuickStart/de/cognitive-flow.json
@@ -133,7 +133,7 @@
                   "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctors",
                   "selector": "$[:].ExternalId"
                 },
-                "condition": "{{$in _raw.doctor.ExternalId _response}}"
+                "condition": "{{$in doctor.ExternalId _response}}"
               },
               "error-message": [
                 "{{doctor}} ist leider nicht verfügbar."
@@ -160,7 +160,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
                   "method": "GET"
                 },
                 "condition": "{{$in ($date date 'YYYY-MM-DD') _response}}"
@@ -173,7 +173,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
               "method": "GET"
             }
           }
@@ -190,7 +190,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
                   "method": "GET"
                 },
                 "condition": "{{$in time _response}}"
@@ -203,7 +203,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
               "method": "GET"
             }
           }
@@ -262,7 +262,7 @@
               "Content-Type": "application/json"
             },
             "payload": {
-              "DoctorID": "{{_raw.doctor.ExternalId}}",
+              "DoctorID": "{{doctor.ExternalId}}",
               "PatientName": "{{contactName}}",
               "Date": "{{date}}",
               "Time": "{{time}}"
diff --git a/QuickStart/en/cognitive-flow.json b/QuickStart/en/cognitive-flow.json
index feea4d5..e3a0e4d 100644
--- a/QuickStart/en/cognitive-flow.json
+++ b/QuickStart/en/cognitive-flow.json
@@ -133,7 +133,7 @@
                   "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctors",
                   "selector": "$[:].ExternalId"
                 },
-                "condition": "{{$in _raw.doctor.ExternalId _response}}"
+                "condition": "{{$in doctor.ExternalId _response}}"
               },
               "error-message": [
                 "Unfortunately, {{doctor}} is not available."
@@ -160,7 +160,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
                   "method": "GET"
                 },
                 "condition": "{{$in ($date date 'YYYY-MM-DD') _response}}"
@@ -173,7 +173,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI _raw.doctor.ExternalId}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorDays?doctorId={{$encodeURI doctor.ExternalId}}",
               "method": "GET"
             }
           }
@@ -190,7 +190,7 @@
               "type": "custom",
               "parameters": {
                 "data-source": {
-                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+                  "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
                   "method": "GET"
                 },
                 "condition": "{{$in time _response}}"
@@ -203,7 +203,7 @@
           "display": {
             "type": "quick-reply",
             "data-source": {
-              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI _raw.doctor.ExternalId}}&date={{$encodeURI date}}",
+              "endpoint": "https://api.everlive.com/v1/niuqpjk7bubu0282/Functions/GetDoctorHours?doctorId={{$encodeURI doctor.ExternalId}}&date={{$encodeURI date}}",
               "method": "GET"
             }
           }
@@ -262,7 +262,7 @@
               "Content-Type": "application/json"
             },
             "payload": {
-              "DoctorID": "{{_raw.doctor.ExternalId}}",
+              "DoctorID": "{{doctor.ExternalId}}",
               "PatientName": "{{contactName}}",
               "Date": "{{date}}",
               "Time": "{{time}}"