diff -r 71643a839c80 roundup/cgi/templating.py
--- a/roundup/cgi/templating.py	Thu Jul 14 22:03:48 2016 -0400
+++ b/roundup/cgi/templating.py	Sun Jul 17 21:34:08 2016 -0400
@@ -1399,6 +1399,10 @@
             # just return the matched text
             return match.group(0)
 
+    def url_quote(self):
+        """ Return the string in plain format but escaped for use in a url """
+        return urllib.quote(self.plain())
+
     def hyperlinked(self):
         """ Render a "hyperlinked" version of the text """
         return self.plain(hyperlink=1)
diff -r 71643a839c80 share/roundup/templates/classic/html/page.html
--- a/share/roundup/templates/classic/html/page.html	Thu Jul 14 22:03:48 2016 -0400
+++ b/share/roundup/templates/classic/html/page.html	Sun Jul 17 21:34:08 2016 -0400
@@ -54,7 +54,7 @@
    <span i18n:translate=""
     ><b>Your Queries</b> (<a href="query?@template=edit">edit</a>)</span><br>
    <tal:block tal:repeat="qs request/user/queries">
-    <a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
+    <a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name/url_quote}"
        tal:content="qs/name">link</a><br>
    </tal:block>
   </p>
diff -r 71643a839c80 share/roundup/templates/devel/html/page.html
--- a/share/roundup/templates/devel/html/page.html	Thu Jul 14 22:03:48 2016 -0400
+++ b/share/roundup/templates/devel/html/page.html	Sun Jul 17 21:34:08 2016 -0400
@@ -210,7 +210,7 @@
         <span i18n:translate=""><b>Your Queries</b> (<a class="nomargin" href="query?@template=edit">edit</a>)</span><br/>
         <ul tal:repeat="qs request/user/queries">
          <li>
-          <a tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}" tal:content="qs/name">link</a>
+          <a tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}" tal:content="qs/name/url_quote">link</a>
          </li>
         </ul>
        </li>
diff -r 71643a839c80 share/roundup/templates/minimal/html/page.html
--- a/share/roundup/templates/minimal/html/page.html	Thu Jul 14 22:03:48 2016 -0400
+++ b/share/roundup/templates/minimal/html/page.html	Sun Jul 17 21:34:08 2016 -0400
@@ -54,7 +54,7 @@
    <span i18n:translate=""
     ><b>Your Queries</b> (<a href="query?@template=edit">edit</a>)</span><br>
    <tal:block tal:repeat="qs request/user/queries">
-    <a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
+    <a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name/url_quote}"
        tal:content="qs/name">link</a><br>
    </tal:block>
   </p>
diff -r 71643a839c80 share/roundup/templates/responsive/html/page.html
--- a/share/roundup/templates/responsive/html/page.html	Thu Jul 14 22:03:48 2016 -0400
+++ b/share/roundup/templates/responsive/html/page.html	Sun Jul 17 21:34:08 2016 -0400
@@ -227,7 +227,7 @@
               <span i18n:translate=""><b>Your Queries</b> (<a class="nomargin" href="query?@template=edit">edit</a>)</span><br/>
               <ul tal:repeat="qs request/user/queries">
                 <li>
-                  <a tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}" tal:content="qs/name">link</a>
+                  <a tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name/url_quote}" tal:content="qs/name">link</a>
                 </li>
               </ul>
            </li>