diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json
index d22aeb101..21d448b8d 100644
--- a/assets/layers/advertising/advertising.json
+++ b/assets/layers/advertising/advertising.json
@@ -1060,7 +1060,9 @@
         "cs": "plakátovací skříň připevněná na stěnu",
         "pt": "uma caixa de pôster montada em uma parede"
       },
-      "snapToLayer": "walls_and_buildings"
+      "snapToLayer": [
+        "walls_and_buildings"
+      ]
     },
     {
       "tags": [
@@ -1179,7 +1181,9 @@
         "./assets/themes/advertising/TV_media.jpg",
         "./assets/themes/advertising/Times square.jpg"
       ],
-      "snapToLayer": "walls_and_buildings",
+      "snapToLayer": [
+        "walls_and_buildings"
+      ],
       "maxSnapDistance": 5
     },
     {
@@ -1209,7 +1213,9 @@
         "./assets/themes/advertising/tarp_feder.jpg",
         "./assets/themes/advertising/tarp_madrid.jpg"
       ],
-      "snapToLayer": "walls_and_buildings",
+      "snapToLayer": [
+        "walls_and_buildings"
+      ],
       "maxSnapDistance": 5
     },
     {
@@ -1259,7 +1265,9 @@
         "./assets/themes/advertising/sign_EOI.jpg",
         "./assets/themes/advertising/farma_sign.jpg"
       ],
-      "snapToLayer": "walls_and_buildings",
+      "snapToLayer": [
+        "walls_and_buildings"
+      ],
       "maxSnapDistance": 5
     },
     {
@@ -1298,7 +1306,9 @@
         "./assets/themes/advertising/Capitol_wall.jpg",
         "./assets/themes/advertising/clarke_wall.jpg"
       ],
-      "snapToLayer": "walls_and_buildings",
+      "snapToLayer": [
+        "walls_and_buildings"
+      ],
       "maxSnapDistance": 5
     }
   ]
diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index 0f5476ec4..9d25519b8 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -139,7 +139,9 @@
         "cs": "umělecké dílo na zdi",
         "es": "Una obra de arte en la pared"
       },
-      "snapToLayer": "walls_and_buildings"
+      "snapToLayer": [
+        "walls_and_buildings"
+      ]
     }
   ],
   "calculatedTags": [
diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index 321da5733..f10b56967 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -108,7 +108,9 @@
         "nb_NO": "En pullert i veien",
         "ca": "Un bol·lard a la carretera"
       },
-      "snapToLayer": "cycleways_and_roads",
+      "snapToLayer": [
+        "cycleways_and_roads"
+      ],
       "maxSnapDistance": 25
     },
     {
@@ -139,7 +141,9 @@
         "nb_NO": "Sykkelbarrièrer, for å dempe farten",
         "ca": "Una barrera ciclista que relanteix als ciclistes"
       },
-      "snapToLayer": "cycleways_and_roads",
+      "snapToLayer": [
+        "cycleways_and_roads"
+      ],
       "maxSnapDistance": 25
     }
   ],
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index ffa90476b..d55fdc117 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -4411,4 +4411,4 @@
     },
     "neededChangesets": 10
   }
-}
\ No newline at end of file
+}
diff --git a/assets/layers/clock/clock.json b/assets/layers/clock/clock.json
index cec32bffa..5162d4e62 100644
--- a/assets/layers/clock/clock.json
+++ b/assets/layers/clock/clock.json
@@ -429,7 +429,9 @@
         "ca": "Un rellotge visible públicament muntat en una paret",
         "fr": "Une horloge publique fixée sur un mur"
       },
-      "snapToLayer": "walls_and_buildings"
+      "snapToLayer": [
+        "walls_and_buildings"
+      ]
     }
   ],
   "allowMove": true,
diff --git a/assets/layers/crossings/crossings.json b/assets/layers/crossings/crossings.json
index b8ca7b79a..f2f8972d0 100644
--- a/assets/layers/crossings/crossings.json
+++ b/assets/layers/crossings/crossings.json
@@ -84,7 +84,9 @@
         "da": "Overgang for fodgængere og/eller cyklister",
         "es": "Cruce para peatones y/o ciclistas"
       },
-      "snapToLayer": "cycleways_and_roads",
+      "snapToLayer": [
+        "cycleways_and_roads"
+      ],
       "maxSnapDistance": 25
     },
     {
@@ -108,7 +110,9 @@
         "da": "Trafiksignal på en vej",
         "es": "Señal de tráfico en una carretera"
       },
-      "snapToLayer": "cycleways_and_roads",
+      "snapToLayer": [
+        "cycleways_and_roads"
+      ],
       "maxSnapDistance": 25
     }
   ],
diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index b7fdd11f9..71acd5df7 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -72,7 +72,9 @@
       "tags": [
         "emergency=defibrillator"
       ],
-      "snapToLayer": "walls_and_buildings",
+      "snapToLayer": [
+        "walls_and_buildings"
+      ],
       "maxSnapDistance": 5
     }
   ],
diff --git a/assets/layers/rainbow_crossings/rainbow_crossings.json b/assets/layers/rainbow_crossings/rainbow_crossings.json
index b397da6fd..b851491ac 100644
--- a/assets/layers/rainbow_crossings/rainbow_crossings.json
+++ b/assets/layers/rainbow_crossings/rainbow_crossings.json
@@ -55,7 +55,9 @@
         "fr": "Passage piéton",
         "ca": "Pas de vianants"
       },
-      "snapToLayer": "cycleways_and_roads",
+      "snapToLayer": [
+        "cycleways_and_roads"
+      ],
       "maxSnapDistance": 25
     }
   ],
diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json
index ae0cb3a9c..835582119 100644
--- a/assets/layers/surveillance_camera/surveillance_camera.json
+++ b/assets/layers/surveillance_camera/surveillance_camera.json
@@ -592,7 +592,9 @@
         "de": "eine an einer Wand montierte Überwachungskamera",
         "es": "una cámara de vigilancia montada en una pared"
       },
-      "snapToLayer": "walls_and_buildings"
+      "snapToLayer": [
+        "walls_and_buildings"
+      ]
     }
   ],
   "mapRendering": [