diff --git a/wiki/macro/EventCalendar.py b/wiki/macro/EventCalendar.py
index 3a9b3683..e7a6a358 100644
--- a/wiki/macro/EventCalendar.py
+++ b/wiki/macro/EventCalendar.py
@@ -268,13 +268,11 @@ def execute(macro, args):
     if args:
         args=request.getText(args)
 
-    for item in macro.request.query_string.split('&'):
-        if item.strip():
-            item = item.split('=')
-            if not form_vals.has_key(item[0]):
-                try:
-		    form_vals[item[0]]=item[1]
-                except AttributeError:
+    for item in macro.request.values.items():
+        if not form_vals.has_key(item[0]):
+            try:
+                form_vals[item[0]]=item[1]
+            except AttributeError:
                     pass
     
     # PROCESSING ACTIONS ----------------------------------------