diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index fe6bc5a07db..baf05d8d0dc 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -27,6 +27,7 @@ function (angular, _, kbn) {
       var qs = [];
 
       _.each(options.targets, function(target) {
+        if (!target.metric) { return; }
         qs.push(convertTargetToQuery(target, options));
       });
 
diff --git a/public/app/plugins/datasource/opentsdb/partials/query.editor.html b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
index a5478ff0cc3..0e456a29b8b 100644
--- a/public/app/plugins/datasource/opentsdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
@@ -55,7 +55,7 @@
                  placeholder="metric name"
                  data-min-length=0 data-items=100
 								 ng-model-onblur
-                 ng-blur="targetBlur()"
+                 ng-change="targetBlur()"
                  >
           <a bs-tooltip="target.errors.metric"
              style="color: rgb(229, 189, 28)"
diff --git a/public/app/plugins/datasource/opentsdb/queryCtrl.js b/public/app/plugins/datasource/opentsdb/queryCtrl.js
index be8ff2aa06c..72ae9710d08 100644
--- a/public/app/plugins/datasource/opentsdb/queryCtrl.js
+++ b/public/app/plugins/datasource/opentsdb/queryCtrl.js
@@ -47,7 +47,7 @@ function (angular, _, kbn) {
     };
 
     $scope.suggestMetrics = function(query, callback) {
-      $scope.datasource.metricFindQuery('metrics()')
+      $scope.datasource.metricFindQuery('metrics(' + query + ')')
         .then($scope.getTextValues)
         .then(callback);
     };