diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index e37a307de4..d14512a964 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -111,26 +111,33 @@
               "stade"
             ],
             "removePostfixes": [
-              "steenweg",
-              "heirbaan",
               "baan",
+              "boulevard",
+              "dreef",
+              "church",
+              "heirbaan",
+              "gasse",
+              "grundschule",
+              "gymnasium",
+              "kaai",
+              "kerk",
+              "laan",
+              "pad",
+              "park",
+              "parque",
+              "path",
+              "platz",
+              "plaza",
+              "plein",
+              "ring",
+              "schule",
+              "square",
+              "steenweg",
               "straat",
+              "straße",
               "street",
               "weg",
-              "dreef",
-              "laan",
-              "boulevard",
-              "pad",
-              "path",
-              "plein",
-              "square",
-              "plaza",
-              "wegel",
-              "kerk",
-              "church",
-              "kaai",
-              "park",
-              "parque"
+              "wegel"
             ]
           }
         ]
diff --git a/assets/layers/surveillance_camera/surveillance_camera.json b/assets/layers/surveillance_camera/surveillance_camera.json
index a1e789544c..cea34d79c8 100644
--- a/assets/layers/surveillance_camera/surveillance_camera.json
+++ b/assets/layers/surveillance_camera/surveillance_camera.json
@@ -436,7 +436,7 @@
         {
           "if": "camera:mount=pole",
           "then": {
-            "en": "This camera is placed one a pole",
+            "en": "This camera is placed on a pole",
             "nl": "Deze camera staat op een paal",
             "fr": "Cette caméra est placée sur un poteau",
             "it": "Questa telecamera è posizionata su un palo",
@@ -452,6 +452,26 @@
             "it": "Questa telecamera è posizionata sul soffitto",
             "de": "Diese Kamera ist an der Decke montiert"
           }
+        },
+        {
+          "if": "camera:mount=street_lamp",
+          "then": {
+            "en": "This camera is placed on a street light",
+            "nl": "Deze camera staat op een straatlantaarn",
+            "fr": "Cette caméra est placée sur un lampadaire",
+            "it": "Questa telecamera è posizionata su un lampione",
+            "de": "Diese Kamera befindet sich an einer Straßenlaterne"
+          }
+        },
+        {
+          "if": "camera:mount=tree",
+          "then": {
+            "en": "This camera is placed on a tree",
+            "nl": "Deze camera staat op een boom",
+            "fr": "Cette caméra est placée sur un arbre",
+            "it": "Questa telecamera è posizionata su un albero",
+            "de": "Diese Kamera ist an einem Baum angebracht"
+          }
         }
       ],
       "id": "camera:mount"
@@ -550,4 +570,4 @@
     "nl": "Deze laag toont bewakingscamera's en laat toe om de informatie te verrijken en om nieuwe camera\"s toe te voegen",
     "de": "Diese Ebene zeigt die Überwachungskameras an und ermöglicht es, Informationen zu aktualisieren und neue Kameras hinzuzufügen"
   }
-}
\ No newline at end of file
+}