diff --git a/pycsw/ogc/api/templates/items.html b/pycsw/ogc/api/templates/items.html
index 80c16ef5f..42f62160f 100644
--- a/pycsw/ogc/api/templates/items.html
+++ b/pycsw/ogc/api/templates/items.html
@@ -85,8 +85,11 @@
     <div class="col-md-4">
       <form action="{{ nav_links.self.split('?')[0] }}" method="GET">
       <div class="input-group mb-3"> 
-          <input type="text" class="form-control" name="q" placeholder="Search" value="{{ attrs['q'] }}">
-          <input class="btn btn-outline-secondary" type="submit" value="Search"></input>
+        <input type="text" class="form-control" name="q" placeholder="Search" id="tbq" value="">
+        <script>
+          $('#tbq').val(decodeURIComponent("{{ attrs['q'].replace('+',' ') }}"))
+        </script>
+        <input class="btn btn-outline-secondary" type="submit" value="Search"></input>
       </div>
       </form>
     </div>