diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 7872243..ce4b83e 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -4,14 +4,19 @@
 
 use App\Models\AudioRecord;
 use NominatimLaravel\Content\Nominatim;
+use App\Services\UrlLocaliser;
 
 class SearchController extends Controller
 {
-    public function __construct(Nominatim $searchApi) {
+    protected $searchApi;
+    protected $urlLocaliser;
+
+    public function __construct(Nominatim $searchApi, UrlLocaliser $urlLocaliser) {
         $this->searchApi = $searchApi;
+        $this->urlLocaliser = $urlLocaliser;
     }
 
-    public function index(string $locale, string $place) {
+    public function index(string $locale, string $place = '') {
 
         $search = $this->searchApi->newSearch();
         $search->query($place)->viewbox(-5.5151, 51.2956, -2.6870, 53.5011);
@@ -48,6 +53,7 @@ public function index(string $locale, string $place) {
         return view('search', [
             'place' => $place,
             'results' => $list,
+            'urllocaliser' => $this->urlLocaliser
         ]);
     }
 }
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 4824030..6becfd5 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -6,13 +6,7 @@
     <p>{{ __('This list shows the latest audio clips.') }}</p>
     <p>{{ __('Search for a place name to add a new audio clip.') }}</p>
 
-    <form method="GET" enctype="multipart/form-data" id="placeSearchForm" action="{{ $urllocaliser->route('filter') }}">
-        @csrf
-
-        <label for="place">{{ __('Place name') }}</label>
-        <input type="text" name="place" id="place" placeholder="{{ __('Search for a place name') }}"></input>
-        <input type="submit" value="{{ __('Search') }}">
-    </form>
+    @include('search-form')
 
     <ul>
         @foreach ($audioRecords as $row)
diff --git a/resources/views/search-form.blade.php b/resources/views/search-form.blade.php
new file mode 100644
index 0000000..c5cc52f
--- /dev/null
+++ b/resources/views/search-form.blade.php
@@ -0,0 +1,7 @@
+<form method="GET" enctype="multipart/form-data" id="placeSearchForm" action="{{ $urllocaliser->route('filter') }}">
+    @csrf
+
+    <label for="place">{{ __('Place name') }}</label>
+    <input type="text" name="place" id="place" placeholder="{{ __('Search for a place name') }}" value="{{ $place ?? '' }}">
+    <input type="submit" value="{{ __('Search') }}">
+</form>
diff --git a/resources/views/search.blade.php b/resources/views/search.blade.php
index 3fe084d..a681e97 100644
--- a/resources/views/search.blade.php
+++ b/resources/views/search.blade.php
@@ -1,7 +1,10 @@
+
 <h1>{{ __('Search') }}</h1>
 
 <h2>{{ __('Results for :place', ['place' => $place]) }}</h2>
 
+@include('search-form')
+
 <ul>
 @foreach ($results as $row)
     @include('item')
diff --git a/routes/web.php b/routes/web.php
index 2e2ac6e..49e8a15 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -30,7 +30,7 @@
         return redirect()->route('search', ['place' => $request->place, 'locale' => app()->getLocale()]);
     })->name('filter');
 
-    Route::get('/search/place/{place}', [SearchController::class, 'index'])
+    Route::get('/search/place/{place?}', [SearchController::class, 'index'])
         ->name('search');
 
     Route::get('/audio/record', [AudioController::class, 'record'])