diff --git a/wiki/macro/EventCalendar.py b/wiki/macro/EventCalendar.py
index 249d5b03..1ae435bd 100644
--- a/wiki/macro/EventCalendar.py
+++ b/wiki/macro/EventCalendar.py
@@ -268,12 +268,14 @@ def execute(macro, args):
     if args:
         args=request.getText(args)
 
-    for item in macro.request.form.items():
-        if not form_vals.has_key(item[0]):
-	    try:
-		    form_vals[item[0]]=item[1][0]
-	    except AttributeError:
-	        pass
+    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:
+                    pass
     
     # PROCESSING ACTIONS ----------------------------------------
     cal_action = form_vals.get('calaction', default_action)