diff --git a/lib/alert/addon/components/alert/form-project-rule-row/component.js b/lib/alert/addon/components/alert/form-project-rule-row/component.js
index 0b0aac223..69f44f30a 100644
--- a/lib/alert/addon/components/alert/form-project-rule-row/component.js
+++ b/lib/alert/addon/components/alert/form-project-rule-row/component.js
@@ -20,6 +20,7 @@ export default Component.extend({
 
     set(this, 'restartIntervalSeconds', n);
     set(this, 'model.podRule.restartIntervalSeconds', n * 60);
+    this.expressionChange()
   },
 
   expressionChange: observer('model.metricRule.expression', function() {
@@ -29,19 +30,19 @@ export default Component.extend({
 
     const expression = get(this, 'model.metricRule.expression')
     const globalStore = get(this, 'globalStore')
-    const clusterId = get(this, 'scope.currentCluster.id')
+    const projectId = get(this, 'scope.currentProject.id')
 
     if (expression) {
       set(this, 'graphLoading', true)
       globalStore.rawRequest({
-        url:    `monitormetrics?action=querycluster`,
+        url:    `monitormetrics?action=queryproject`,
         method: 'POST',
         data:   {
           expr:     expression,
           from:     'now-24h',
           interval: '300s',
           to:       'now',
-          clusterId,
+          projectId,
         }
       }).then((res) => {
         if (res.body) {
diff --git a/lib/alert/addon/edit-rule/route.js b/lib/alert/addon/edit-rule/route.js
index 85d2d2b7e..7bc83ef4f 100644
--- a/lib/alert/addon/edit-rule/route.js
+++ b/lib/alert/addon/edit-rule/route.js
@@ -64,6 +64,8 @@ export default Route.extend({
     const t = get(alert, 'targetType');
     const et = get(alert, 'eventRule.eventType');
 
+    set(alert, '_targetType', t);
+
     switch (t) {
     case 'event':
       switch (et) {
@@ -102,8 +104,6 @@ export default Route.extend({
         eventRule,
       })
       break;
-    default:
-      set(alert, '_targetType', t);
     }
 
     return alert;
diff --git a/lib/alert/addon/edit/route.js b/lib/alert/addon/edit/route.js
index 3e18f504b..d800c7ce8 100644
--- a/lib/alert/addon/edit/route.js
+++ b/lib/alert/addon/edit/route.js
@@ -61,6 +61,8 @@ export default Route.extend({
     const t = get(alert, 'targetType');
     const et = get(alert, 'eventRule.eventType');
 
+    set(alert, '_targetType', t);
+
     switch (t) {
     case 'event':
       switch (et) {
@@ -99,8 +101,6 @@ export default Route.extend({
         eventRule,
       })
       break;
-    default:
-      set(alert, '_targetType', t);
     }
 
     return alert;