diff --git a/server.R b/server.R
index 5044454..d7d7242 100644
--- a/server.R
+++ b/server.R
@@ -40,6 +40,7 @@ server <- function(input, output, session) {
     heatmap <- currently_selected_heatmap_crime()
     mapproxy <- leafletProxy("hhmap")
     clearGroup(mapproxy, "selected")
+    clearGroup(mapproxy, "layer_heatmap")
     if (heatmap != "") {
       hideGroup(mapproxy, "layer_bezirke")
       hideGroup(mapproxy, "layer_stadtteile")
@@ -59,7 +60,7 @@ server <- function(input, output, session) {
       )
       addPolygons(mapproxy,
         data = heatmap_polygons,
-        layerId = ~leaflet_id,
+        layerId = paste("heat_", heatmap_polygons$leaflet_id, sep = ""),
         group = "layer_heatmap",
         label = get_map_layer_name(heatmap_polygons$leaflet_id),
         color = "#003063",
@@ -70,7 +71,7 @@ server <- function(input, output, session) {
       #---------------------
     } else {
       print("he")
-      clearGroup(mapproxy, "layer_heatmap")
+      View(mapproxy)
       if (maptype == "Bezirke"){
         hideGroup(mapproxy, "layer_stadtteile")
         showGroup(mapproxy, "layer_bezirke")