diff --git a/Composer/packages/client/src/constants.ts b/Composer/packages/client/src/constants.ts
index 9db46a33d4..19d951df06 100644
--- a/Composer/packages/client/src/constants.ts
+++ b/Composer/packages/client/src/constants.ts
@@ -307,50 +307,50 @@ export const nameRegex = /^[a-zA-Z0-9-_]+$/;
 export const adaptiveCardJsonBody =
   '-```\
 \n{\
-  \n    $schema: http://adaptivecards.io/schemas/adaptive-card.json,\
-  \n    version: 1.0,\
-  \n    type: AdaptiveCard,\
-  \n    speak: "",\
-  \n    body: [\
+  \n    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",\
+  \n    "version": "1.0",\
+  \n    "type": "AdaptiveCard",\
+  \n    "speak": "",\
+  \n    "body": [\
     \n      {\
-      \n        type: TextBlock,\
-      \n        text: ${whichOneDidYouMean()},\
-      \n        weight: Bolder\
+      \n        "type": "TextBlock",\
+      \n        "text": "${whichOneDidYouMean()}",\
+      \n        "weight": "Bolder"\
     \n      },\
     \n      {\
-      \n        type: TextBlock,\
-      \n        text: ${pickOne()},\
-      \n        separator: true\
+      \n        "type": "TextBlock",\
+      \n        "text": "${pickOne()}",\
+      \n        "separator": "true"\
     \n      },\
     \n      {\
-      \n        type: Input.ChoiceSet,\
-      \n        placeholder: Placeholder text,\
-      \n        id: userChosenIntent,\
-      \n        choices: [\
+      \n        "type": "Input.ChoiceSet",\
+      \n        "placeholder": "Placeholder text",\
+      \n        "id": "userChosenIntent",\
+      \n        "choices": [\
         \n                   {\
-          \n                     title: ${getIntentReadBack()},\
-          \n                     value: luisResult\
+          \n                     "title": "${getIntentReadBack()}",\
+          \n                     "value: "luisResult"\
         \n                   },\
         \n                   {\
-          \n                     title: ${getAnswerReadBack()},\
-          \n                     value: qnaResult\
+          \n                     "title": "${getAnswerReadBack()}",\
+          \n                     "value": "qnaResult"\
         \n                   },\
         \n                   {\
-          \n                     title: None of the above,\
-          \n                     value: none\
+          \n                     "title": "None of the above",\
+          \n                     "value": "none"\
         \n                   }\
       \n        ],\
-      \n       style: expanded,\
-      \n       value: luis\
+      \n       "style": "expanded",\
+      \n       "value": "luis"\
     \n     },\
     \n     {\
-      \n       type: ActionSet,\
-      \n       actions: [\
+      \n       "type": "ActionSet",\
+      \n       "actions": [\
         \n         {\
-          \n           type: Action.Submit,\
-          \n           title: Submit,\
-          \n           data: {\
-            \n                   intent: chooseIntentCardResponse\
+          \n           "type": "Action.Submit",\
+          \n           "title": "Submit",\
+          \n           "data": {\
+            \n                   "intent": "chooseIntentCardResponse"\
           \n           }\
         \n         }\
       \n       ]\
diff --git a/Composer/packages/client/src/pages/design/DesignPage.tsx b/Composer/packages/client/src/pages/design/DesignPage.tsx
index c3ea45dad7..7e874a01f5 100644
--- a/Composer/packages/client/src/pages/design/DesignPage.tsx
+++ b/Composer/packages/client/src/pages/design/DesignPage.tsx
@@ -294,8 +294,13 @@ const DesignPage: React.FC<RouteComponentProps<{ dialogId: string; projectId: st
     }
 
     if (lgFile && lgFilePayload) {
+      if (lgFilePayload[`common.${locale}`] && lgFilePayload[`common.${locale}`].length > 0) {
+        await createLgTemplates({ id: `common.${locale}`, templates: lgFilePayload[`common.${locale}`] });
+      }
       for (const key in lgFilePayload) {
-        await createLgTemplates({ id: key, templates: lgFilePayload[key] });
+        if (key !== `common.${locale}`) {
+          await createLgTemplates({ id: key, templates: lgFilePayload[key] });
+        }
       }
     }