diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index a1dab0a6c36..98a966f5c42 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -217,7 +217,7 @@
 								Multi format
 							</li>
 							<li ng-show="current.multi">
-								<select class="input-medium tight-form-input last" ng-model="current.multiFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'regex values', 'lucene']"></select>
+								<select class="input-medium tight-form-input last" ng-model="current.multiFormat" ng-change="runQuery()" ng-options="f for f in ['glob', 'regex values', 'lucene', 'pipe']"></select>
 							</li>
 						</ul>
 						<div class="clearfix"></div>
diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js
index 0880df1a0c4..48aa4edde85 100644
--- a/public/app/features/templating/templateSrv.js
+++ b/public/app/features/templating/templateSrv.js
@@ -46,6 +46,9 @@ function (angular, _) {
           case "lucene": {
             return '(' + value.join(' OR ') + ')';
           }
+          case "pipe": {
+            return value.join('|');
+          }
           default:  {
             return '{' + value.join(',') + '}';
           }