diff --git a/scripts/abfahrtsmonitor.py b/scripts/abfahrtsmonitor.py
index dd2a575..849faa2 100644
--- a/scripts/abfahrtsmonitor.py
+++ b/scripts/abfahrtsmonitor.py
@@ -11,8 +11,8 @@ form = cgi.FieldStorage()
 
 ort = ""
 hst = ""
-vz  = ""
-vm  = ""
+vz = ""
+vm = ""
 timestamp = ""
 
 # check for queries
@@ -27,8 +27,15 @@ if (form.getvalue('vz')):
 if (form.getvalue('timestamp')):
     timestamp = form.getvalue('timestamp')
 
-url = "http://widgets.vvo-online.de/abfahrtsmonitor/Abfahrten.do?ort="+ort+"&hst="+hst+"&vz="+vz+"&vm="+vm+"&timestamp="+timestamp
+queries = {
+    "ort": ort,
+    "hst": hst,
+    "vz": vz,
+    "vm": vm,
+    "timestamp": timestamp
+}
 
+url = "http://widgets.vvo-online.de/abfahrtsmonitor/Abfahrten.do?" + urllib.urlencode(queries)
 data = urllib2.urlopen(url).read()
 
 print("Content-type: text/html\n\n")