diff --git a/Classes/Integration/CoolUri.php b/Classes/Integration/CoolUri.php
index 02347f6..d3d7f1b 100644
--- a/Classes/Integration/CoolUri.php
+++ b/Classes/Integration/CoolUri.php
@@ -608,10 +608,10 @@ private static function extractArraysFromParams($params)
         // turn array back into query string
         // so it can be used with parse_str
         if (empty($params)) {
-            return Array();
+            return [];
         }
-        foreach ($params as $k => $v) $params[$k] = $k . '=' . rawurlencode($v);
-        $qs = implode('&', $params);
+
+        $qs = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl('', $params);
         parse_str($qs, $output);
         return $output;
     }