diff --git a/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/GetCurrentEmployeesOnLocationDialog.dialog b/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/GetCurrentEmployeesOnLocationDialog.dialog
index ab147a63..d5f32bc9 100644
--- a/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/GetCurrentEmployeesOnLocationDialog.dialog
+++ b/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/GetCurrentEmployeesOnLocationDialog.dialog
@@ -23,29 +23,6 @@
           },
           "name": "SSWSophieBot.GetCurrentEmployeesOnLocation.BeginDialog"
         },
-        {
-          "$kind": "Microsoft.IfCondition",
-          "$designer": {
-            "id": "iRae1n"
-          },
-          "condition": "=exists(dialog.locationEntity) && length(dialog.locationEntity) > 0",
-          "elseActions": [
-            {
-              "$kind": "Microsoft.SendActivity",
-              "$designer": {
-                "id": "0iZBft"
-              },
-              "activity": "${SendActivity_0iZBft()}"
-            },
-            {
-              "$kind": "Microsoft.EndDialog",
-              "$designer": {
-                "id": "Cg630n"
-              }
-            }
-          ],
-          "actions": []
-        },
         {
           "$kind": "Microsoft.IfCondition",
           "$designer": {
@@ -162,31 +139,65 @@
           "resultProperty": "turn.utcEndTime"
         },
         {
-          "$kind": "GetProfileAction",
+          "$kind": "Microsoft.IfCondition",
           "$designer": {
-            "id": "H3FuOa"
+            "id": "4yPDKi"
           },
-          "queryString": [
-            {
-              "key": "location",
-              "value": "=dialog.locationEntity"
-            },
-            {
-              "key": "inoffice",
-              "value": "=true"
-            },
+          "actions": [
             {
-              "key": "fromDate",
-              "value": "=if(turn.isNowQuery, null, turn.utcStartTime)"
-            },
+              "$kind": "GetProfileAction",
+              "$designer": {
+                "id": "uOGxSF"
+              },
+              "queryString": [
+                {
+                  "key": "location",
+                  "value": "=dialog.locationEntity"
+                },
+                {
+                  "key": "inoffice",
+                  "value": "=true"
+                },
+                {
+                  "key": "fromDate",
+                  "value": "=if(turn.isNowQuery, null, turn.utcStartTime)"
+                },
+                {
+                  "key": "endDate",
+                  "value": "=if(turn.isNowQuery, null, turn.utcEndTime)"
+                }
+              ],
+              "statusCodeProperty": "turn.statusCode",
+              "reasonPhraseProperty": "turn.reasonPhrase",
+              "employeesProperty": "turn.employees"
+            }
+          ],
+          "elseActions": [
             {
-              "key": "endDate",
-              "value": "=if(turn.isNowQuery, null, turn.utcEndTime)"
+              "$kind": "GetProfileAction",
+              "$designer": {
+                "id": "YLDQp1"
+              },
+              "queryString": [
+                {
+                  "key": "inoffice",
+                  "value": "=true"
+                },
+                {
+                  "key": "fromDate",
+                  "value": "=if(turn.isNowQuery, null, turn.utcStartTime)"
+                },
+                {
+                  "key": "endDate",
+                  "value": "=if(turn.isNowQuery, null, turn.utcEndTime)"
+                }
+              ],
+              "statusCodeProperty": "turn.statusCode",
+              "reasonPhraseProperty": "turn.reasonPhrase",
+              "employeesProperty": "turn.employees"
             }
           ],
-          "statusCodeProperty": "turn.statusCode",
-          "reasonPhraseProperty": "turn.reasonPhrase",
-          "employeesProperty": "turn.employees"
+          "condition": "=exists(dialog.locationEntity) && length(dialog.locationEntity) > 0"
         },
         {
           "$kind": "Microsoft.IfCondition",
diff --git a/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/language-generation/en-us/GetCurrentEmployeesOnLocationDialog.en-us.lg b/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/language-generation/en-us/GetCurrentEmployeesOnLocationDialog.en-us.lg
index 2f9a407e..b621383a 100644
--- a/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/language-generation/en-us/GetCurrentEmployeesOnLocationDialog.en-us.lg
+++ b/bots/employee-finder/src/SSW.SophieBot/dialogs/GetCurrentEmployeesOnLocationDialog/language-generation/en-us/GetCurrentEmployeesOnLocationDialog.en-us.lg
@@ -1,49 +1,49 @@
-[Common](common.en-us.lg)
-[PeopleList](peopleList.en-us.lg)
-
-# SendActivity_5SdoY2()
-[Activity
-    Text = ${SendActivity_5SdoY2_text()}
-]
-
-# SendActivity_5SdoY2_text()
-- ${ErrorMessage()}
-
-# SendActivity_MfjfA1()
-[Activity
-    Text = ${SendActivity_MfjfA1_text()}
-]
-
-# SendActivity_MfjfA1_text()
-- I couldn't find anyone in the **${dialog.locationEntity}** office at this time.
-# SendActivity_0iZBft()
-[Activity
-    Text = ${SendActivity_0iZBft_text()}
-]
-
-# SendActivity_0iZBft_text()
-- Please specify a valid location to query.
-
-# SendActivity_WXpguy()
-[Activity
-    Attachments = ${json(PeopleListByBilled(
-        if(dialog.foreach.pageindex == 1, CardTitle(dialog.locationEntity, count(turn.billableEmployees.employees)), GetNextTitle(dialog.foreach.pageindex, 10)), 
-        turn.clientDateTime,
-        if(dialog.foreach.pageindex == 1, true, false),
-        dialog.foreach.page,
-        dialog.foreach.pageindex * 10 >= count(turn.billableEmployees.employees),
-        '',
-        false,
-        'GetCurrentEmployeesOnLocation'))}
-]
-
-# CardTitle(location, count)
-- ```${location} - All [${count}]```
-
-# SendActivity_jhwmNx()
-[Activity
-    Text = ${SendActivity_jhwmNx_text()}
-]
-
-# SendActivity_jhwmNx_text()
-- Please specify a valid date to query.
+[Common](common.en-us.lg)
+[PeopleList](peopleList.en-us.lg)
+
+# SendActivity_5SdoY2()
+[Activity
+    Text = ${SendActivity_5SdoY2_text()}
+]
+
+# SendActivity_5SdoY2_text()
+- ${ErrorMessage()}
+
+# SendActivity_MfjfA1()
+[Activity
+    Text = ${SendActivity_MfjfA1_text()}
+]
+
+# SendActivity_MfjfA1_text()
+- I couldn't find anyone in the **${dialog.locationEntity}** office at this time.
+# SendActivity_WXpguy()
+[Activity
+    Attachments = ${json(PeopleListByBilled(
+        if(dialog.foreach.pageindex == 1, CardTitle(dialog.locationEntity, count(turn.billableEmployees.employees)), GetNextTitle(dialog.foreach.pageindex, 10)), 
+        turn.clientDateTime,
+        if(dialog.foreach.pageindex == 1, true, false),
+        dialog.foreach.page,
+        dialog.foreach.pageindex * 10 >= count(turn.billableEmployees.employees),
+        '',
+        false,
+        'GetCurrentEmployeesOnLocation'))}
+]
+
+# CardTitle(location, count)
+- ```${location} - All [${count}]```
+
+# SendActivity_jhwmNx()
+[Activity
+    Text = ${SendActivity_jhwmNx_text()}
+]
+
+# SendActivity_jhwmNx_text()
+- Please specify a valid date to query.
+
+# LogAction_Text_X1smd9()
+[Activity
+    Text = ${LogAction_Text_X1smd9_text()}
+]
+
+# LogAction_Text_X1smd9_text()
+- [Debug] - dialog.locationEntity = ${dialog.locationEntity}
\ No newline at end of file