diff --git a/app/agora.py b/app/agora.py
index 5803901c3..818920d6f 100644
--- a/app/agora.py
+++ b/app/agora.py
@@ -186,6 +186,7 @@ def node(node,user_list=[]):
             pulling_nodes=n.pulling_nodes(),
             pushing_nodes=n.pushing_nodes(),
             q=n.wikilink.replace('-', '%20'),
+            qstr=n.wikilink.replace('-', ' '),
             # disabled a bit superstitiously due to [[heisenbug]] after I added this everywhere :).
             # sorry for the fuzzy thinking but I'm short on time and want to get things done.
             # (...famous last words).
diff --git a/app/templates/base.html b/app/templates/base.html
index d1ff48394..bcc3d6d5c 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -47,7 +47,7 @@
         | <a href="/nodes">nodes</a>
 		| <a href="/users">@</a>
 		| <a href="/latest">Δ</a>
-        | <form action="/exec" method="get" style="display: inline;"><a href="/node/agora-cli">exec</a>: <input type="text" value="{{node}}" name="q"></form>
+        | <form action="/exec" method="get" style="display: inline;"><a href="/node/agora-cli">exec</a>: <input type="text" value="{{qstr}}" name="q"></form>
         | <a href="#" style="text-decoration: none;" class="theme-toggle">🌙</a>
 		<!-- doesn't fit on mobile right now.
         | <a href="/node/agora-help" style="text-decoration: none;" class="help-button">ℹ️</a>
diff --git a/app/templates/search.html b/app/templates/search.html
index 290aa9716..6894c2758 100644
--- a/app/templates/search.html
+++ b/app/templates/search.html
@@ -17,7 +17,7 @@
 <div class="search">
     <div class="search-flex">
         <div class="search-internet">
-            <span class="search-internet-header">Search for '{{q}}' around the web</span> <br />
+            <span class="search-internet-header">Search for '{{qstr}}' around the web</span> <br />
             ↪ <a href="https://www.google.com/search?q={{q}}">Google</a> <br />
             ↪ <a href="https://www.duckduckgo.com/{{q}}">DuckDuckGo</a> <br />
             ↪ <a href="https://en.wikipedia.org/wiki/Special:Search/{{q}}">Wikipedia</a> <br />
@@ -30,7 +30,7 @@
         </div>
 
         <div class="search-agora">
-            <span class="search-agora-header">Search for '{{q}}' in the Agora</span> <br />
+            <span class="search-agora-header">Search for '{{qstr}}' in the Agora</span> <br />
             {% if search %}
             {% for subnode in search %}
             <a href="/@{{subnode.user}}/{{subnode.wikilink}}">@{{subnode.user}}/{{subnode.wikilink}}</a><br />