diff --git a/dogsheep_beta/__init__.py b/dogsheep_beta/__init__.py
index b45b486..8daac53 100644
--- a/dogsheep_beta/__init__.py
+++ b/dogsheep_beta/__init__.py
@@ -213,13 +213,13 @@ async def execute_search(searchmode_raw):
             if column in request.args:
                 args[column] = request.args[column]
 
-        path_with_query_string = "/{}/search_index.json?{}".format(
+        path_with_query_string = datasette.urls.path("/{}/search_index.json?{}".format(
             database_name,
             urllib.parse.urlencode(
                 args,
                 doseq=True,
             ),
-        )
+        ))
         inner_response = await datasette.client.get(
             path_with_query_string, cookies=request.cookies
         )
diff --git a/dogsheep_beta/templates/beta.html b/dogsheep_beta/templates/beta.html
index 94bf95c..1666908 100644
--- a/dogsheep_beta/templates/beta.html
+++ b/dogsheep_beta/templates/beta.html
@@ -38,7 +38,7 @@
 </style>
 <h1>Dogsheep Beta{% if q %}: {{ q }}{% endif %}</h1>
 
-<form action="/-/beta" method="get"><div>
+<form action="{{ base_url }}-/beta" method="get"><div>
     <input type="search" name="q" value="{{ q }}" id="q">
     {% if sorted_by != "relevance" %}
         <input type="hidden" name="sort" value="{{ sorted_by }}">