diff --git a/application/controllers/IcingadbimgController.php b/application/controllers/IcingadbimgController.php
index bd4be89..a4a920a 100644
--- a/application/controllers/IcingadbimgController.php
+++ b/application/controllers/IcingadbimgController.php
@@ -193,7 +193,7 @@ public function indexAction()
                 $this->customVars = str_replace($search, $replace, $this->customVars);
             }
 
-            // urlencodee values
+            // urlencode values
             $customVars = "";
             foreach (preg_split('/\&/', $this->customVars, -1, PREG_SPLIT_NO_EMPTY) as $param) {
                 $arr = explode("=", $param);
diff --git a/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php b/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php
index 63ed288..9b2207f 100644
--- a/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php
+++ b/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php
@@ -437,7 +437,7 @@ public function getPreviewHtml(Model $object, $report = false)
                 if ($this->dataSource === "graphite") {
                     $arr[1] = Util::graphiteReplace($arr[1]);
                 }
-                $customVars .= '&' . $arr[0] . '=' . rawurlencode($arr[1]);
+                $customVars .= '&' . $arr[0] . '=' . rawurlencode(implode('=', array_slice($arr, 1)));
             }
             $this->customVars = $customVars;
         }