diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema
index 34b87ce5b7..a0d1683dea 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.LogAction.uischema
@@ -3,6 +3,6 @@
     "form": {
         "label": "Log to console",
         "subtitle": "Log Action",
-        "helpLink": "https://aka.ms/bfc-debugging-bots"
+        "helpLink": "https://aka.ms/composer-telemetry"
     }
 }
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema
index 6bd536933b..25ff1b1bc9 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.SendActivity.schema
@@ -11,12 +11,9 @@
             "description": "Optional id for the dialog"
         },
         "disabled": {
-            "$ref": "schema:#/definitions/stringExpression",
+            "$ref": "schema:#/definitions/booleanExpression",
             "title": "Disabled",
-            "description": "Optional condition which if true will disable this action.",
-            "examples": [
-                "user.age > 3"
-            ]
+            "description": "Optional condition which if true will disable this action."
         },
         "activity": {
             "$kind": "Microsoft.IActivityTemplate",
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema
index 2554409a03..02d10c850e 100644
--- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/Actions/Microsoft.TraceActivity.uischema
@@ -3,6 +3,6 @@
     "form": {
         "label": "Emit a trace event",
         "subtitle": "Trace Activity",
-        "helpLink": "https://aka.ms/bfc-debugging-bots"
+        "helpLink": "https://aka.ms/composer-telemetry"
     }
 }
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseIntent.uischema b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseIntent.uischema
new file mode 100644
index 0000000000..9afcfc6cc0
--- /dev/null
+++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Schemas/TriggerConditions/Microsoft.OnChooseIntent.uischema
@@ -0,0 +1,12 @@
+{
+    "$schema": "https://schemas.botframework.com/schemas/ui/v1.0/ui.schema",
+    "form": {
+        "order": [
+            "condition",
+            "*"
+        ],
+        "hidden": [
+            "actions"
+        ]
+    }
+}
diff --git a/tests/tests.schema b/tests/tests.schema
index 870033c92f..713083ae99 100644
--- a/tests/tests.schema
+++ b/tests/tests.schema
@@ -774,12 +774,9 @@
           "description": "Optional id for the dialog"
         },
         "disabled": {
-          "$ref": "#/definitions/stringExpression",
+          "$ref": "#/definitions/booleanExpression",
           "title": "Disabled",
-          "description": "Optional condition which if true will disable this action.",
-          "examples": [
-            "user.age > 3"
-          ]
+          "description": "Optional condition which if true will disable this action."
         },
         "activity": {
           "$kind": "Microsoft.IActivityTemplate",
@@ -7916,12 +7913,9 @@
           "description": "Optional id for the dialog"
         },
         "disabled": {
-          "$ref": "#/definitions/stringExpression",
+          "$ref": "#/definitions/booleanExpression",
           "title": "Disabled",
-          "description": "Optional condition which if true will disable this action.",
-          "examples": [
-            "user.age > 3"
-          ]
+          "description": "Optional condition which if true will disable this action."
         },
         "activity": {
           "$kind": "Microsoft.IActivityTemplate",
diff --git a/tests/tests.uischema b/tests/tests.uischema
index 6b66393773..788aba68fa 100644
--- a/tests/tests.uischema
+++ b/tests/tests.uischema
@@ -319,7 +319,7 @@
   },
   "Microsoft.LogAction": {
     "form": {
-      "helpLink": "https://aka.ms/bfc-debugging-bots",
+      "helpLink": "https://aka.ms/composer-telemetry",
       "label": "Log to console",
       "subtitle": "Log Action"
     }
@@ -401,6 +401,17 @@
       "subtitle": "Cancel dialog event"
     }
   },
+  "Microsoft.OnChooseIntent": {
+    "form": {
+      "hidden": [
+        "actions"
+      ],
+      "order": [
+        "condition",
+        "*"
+      ]
+    }
+  },
   "Microsoft.OnCondition": {
     "form": {
       "hidden": [
@@ -762,7 +773,7 @@
   },
   "Microsoft.TraceActivity": {
     "form": {
-      "helpLink": "https://aka.ms/bfc-debugging-bots",
+      "helpLink": "https://aka.ms/composer-telemetry",
       "label": "Emit a trace event",
       "subtitle": "Trace Activity"
     }