Index: pyndexter/util.py
===================================================================
--- pyndexter/util.py	(revision 378)
+++ pyndexter/util.py	(working copy)
@@ -7,6 +7,7 @@
 #
 
 import re
+from StringIO import StringIO
 try:
     set = set
 except:
@@ -35,13 +36,16 @@
     def __init__(self, uri=None):
         if uri is not None:
             from cgi import parse_qs
+            from urllib import unquote_plus
 
             match = self._pattern.match(uri)
             if match is None:
                 raise ValueError('Invalid URI')
-            groups = match.groups()
-            groups = groups[0:5] + (parse_qs(groups[5] or ''),) + groups[6:]
-            groups = [group or '' for group in groups]
+            groups = [g or '' for g in match.groups()]
+            def uqc(gs):
+                return [unquote_plus(g) for g in gs]
+            groups = uqc(groups[0:5]) + [parse_qs(groups[5] or '')] + \
+                     uqc(groups[6:])
         else:
             groups = [''] * 7