diff --git a/app/lib/server_requests/init_state.dart b/app/lib/server_requests/init_state.dart
index f57b75a144cce9911e57ff8c05b79950e70b6669..d4ca66a1e597d6d6ec999f5581a55550ab8988ff 100644
--- a/app/lib/server_requests/init_state.dart
+++ b/app/lib/server_requests/init_state.dart
@@ -48,7 +48,7 @@ Future<void> initSearchOptions() async {
       ..badCertificateCallback = // NB: temporary disable SSL certificate validation
           (X509Certificate cert, String host, int port) => true;
 
-    var request = await client.getUrl(Uri.parse('$serverURI/get_lake_names'));
+    var request = await client.getUrl(Uri.parse('${serverURI}get_lake_names'));
     var response = await request.close();
 
     if (response.statusCode == 200) {
diff --git a/app/lib/utils/custom_search_delegate.dart b/app/lib/utils/custom_search_delegate.dart
index 13c62cf94ff6ad779d4d2dfa612fb4af82a64711..798c4c0b9ea0edcaabd26550833c9dcc89e2d226 100644
--- a/app/lib/utils/custom_search_delegate.dart
+++ b/app/lib/utils/custom_search_delegate.dart
@@ -69,9 +69,16 @@ class CustomSearchDelegate extends SearchDelegate {
       itemCount: searchResults.length,
       itemBuilder: (context, index) {
         var result = searchResults[index];
-        return ListTile(
-          title: Text(result),
-        );
+        if  (searchResults.isNotEmpty) {
+          return ListTile(
+            title: Text(result),
+          );
+        }
+        else {
+          return const ListTile(
+            title: Text("No matches found"),
+          );
+        }
       },
     );
   }