diff --git a/app/lib/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart
index 9ae33a8efd89ef1d79b034a0b9667ca548e75306..2cf8053e51d5d731269e79db334682c1e6ae1ffe 100644
--- a/app/lib/widgets/choropleth_map.dart
+++ b/app/lib/widgets/choropleth_map.dart
@@ -39,6 +39,7 @@ class ChoroplethMapState extends State<ChoroplethMap> {
   @override
   void initState() {
     super.initState();
+      selectedIndex = 0;
       _initDataSource();
     }
 
diff --git a/server/main.py b/server/main.py
index 11a7aab9b124cc355ef915f26ecda447f51be800..fff3b85099c836a188f5a40cba1f655615f4aa30 100644
--- a/server/main.py
+++ b/server/main.py
@@ -170,9 +170,9 @@ if __name__ == "__main__":
     """Start a server on port 8443 using self defined HTTP class"""
     try:
         # Run the automatic updating of measurement data in a dedicated thread
-        scheduler = UpdateScheduler()
-        scheduler_thread = threading.Thread(target=scheduler.start)
-        scheduler_thread.start()
+        #scheduler = UpdateScheduler()
+        #scheduler_thread = threading.Thread(target=scheduler.start)
+        #scheduler_thread.start()
 
         # Initialize database connection
         conn = sqlite3.connect('server/database/icedb')
diff --git a/server/map_handler/lake_relations/all_lake_names.json b/server/map_handler/lake_relations/all_lake_names.json
index d1d3eb65a68c73e21a9996a2dbd03764de9777ac..28aa794b217ed37639e1337639512201fad50477 100644
--- a/server/map_handler/lake_relations/all_lake_names.json
+++ b/server/map_handler/lake_relations/all_lake_names.json
@@ -1,4 +1,17 @@
 [
+  "Aremarksjøen",
+  "Bogstadvannet",
+  "Byglandsfjorden",
+  "Einavatnet",
+  "Farrisvannet",
+  "Femsjøen",
+  "Gjende",
   "Mjøsa",
-  "Skumsjøen"
+  "Nisser",
+  "Randsfjorden",
+  "Sagstusjøen",
+  "Selbusjøen",
+  "Setten",
+  "Skumsjøen",
+  "Totak"
 ]
\ No newline at end of file