diff --git a/src/datasource.ts b/src/datasource.ts
index ccf436c..2072fc4 100644
--- a/src/datasource.ts
+++ b/src/datasource.ts
@@ -59,7 +59,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
     const end = range!.to;
 
     const calls = options.targets.map(target => {
-      const query = getTemplateSrv().replace(target.queryText, options.scopedVars);
+      const query = getTemplateSrv().replace(target.queryText, options.scopedVars, this.formatter);
 
       const request = {
         "query": query,
@@ -90,6 +90,13 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
     };
   }
 
+  private formatter(value: string | string[], options: any): string {
+    if (options.multi) {
+      return (value as string[]).map(v => `'${v}'`).join(',');
+    }
+    return value as string;
+  }
+
   async metricFindQuery(query: string, options?: any): Promise<MetricFindValue[]> {
     const to = new Date();
     const from = new Date();