diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index b9c1d308233185f6970c03c435ce1ee0cc59ddfd..ca25bf5f83e97d0abcc09d1bc50f05267f8b1324 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -64,20 +64,10 @@ class _DefaultPageState extends State<DefaultPage> {
                 showSearch( // Fetch new relation and measurements on search
                   context: context,
                   delegate: CustomSearchDelegate((String result) {
-                    setState(() async {
-                      selectedRelation = await fetchRelation();
-                      selectedMarkerList = await fetchMeasurements().then((fetchResult) {
-                        List<Measurement> measurements = fetchResult.measurements;
-                        serverConnection = fetchResult.connected;
-
-                        // Return the measurements
-                        return measurements;
-                      }).catchError((error) {
-                        serverConnection = false;
-                        throw Exception("Failed to fetch measurements: $error");
-                      });
+                    setState(() {
                       selectedLake = result;
                     });
+                    initialiseState();
                   }),
                 );
               },
diff --git a/app/lib/utils/custom_search_delegate.dart b/app/lib/utils/custom_search_delegate.dart
index 798c4c0b9ea0edcaabd26550833c9dcc89e2d226..09886e07a28751863ca4e73e64d944ea59355276 100644
--- a/app/lib/utils/custom_search_delegate.dart
+++ b/app/lib/utils/custom_search_delegate.dart
@@ -44,14 +44,9 @@ class CustomSearchDelegate extends SearchDelegate {
       itemCount: searchResults.length,
       itemBuilder: (context, index) {
         var result = searchResults[index];
-        return GestureDetector(
-          onTap: () {
-            onResultSelected(result);
-            close(context, result);
-          },
-          child: ListTile(
-            title: Text(result),
-          ),
+        return ListTile(
+          title: Text(result),
+          tileColor: Colors.red,
         );
       },
     );
@@ -72,6 +67,10 @@ class CustomSearchDelegate extends SearchDelegate {
         if  (searchResults.isNotEmpty) {
           return ListTile(
             title: Text(result),
+            onTap: () {
+              onResultSelected(result);
+              close(context, result);
+            },
           );
         }
         else {