diff --git a/app.py b/app.py
index 9fac303..b649abb 100644
--- a/app.py
+++ b/app.py
@@ -1,5 +1,7 @@
 from flask import Flask, g, render_template
 import psycopg2
+import urllib
+from markupsafe import Markup
 
 
 app = Flask(__name__)
@@ -23,6 +25,15 @@ Disallow: /
 """
 
 
+@app.template_filter('urlencode')
+def urlencode_filter(s):
+    if type(s) == 'Markup':
+        s = s.unescape()
+    s = s.encode('utf8')
+    s = urllib.quote_plus(s)
+    return Markup(s)
+
+
 @app.route('/terms')
 @app.route('/')
 def list_terms():
diff --git a/templates/terms.html b/templates/terms.html
index 3dd0173..d79cb8b 100644
--- a/templates/terms.html
+++ b/templates/terms.html
@@ -3,7 +3,7 @@
 <h1>Available terms:</h1>
 <ul>
 {% for term, count in terms %}
-    <li><a href="/term/{{term}}">{{term}}</a> ({{count}} entries)</li>
+    <li><a href="/term/{{term|urlencode}}">{{term}}</a> ({{count}} entries)</li>
 {% endfor %}
 </ul>
 {% endblock %}