diff --git a/assets/layers/recycling/recycling.json b/assets/layers/recycling/recycling.json
index 3d1d23ffb..b0e3f9562 100644
--- a/assets/layers/recycling/recycling.json
+++ b/assets/layers/recycling/recycling.json
@@ -112,7 +112,12 @@
           "then": "circle:#FFFFFF;./assets/layers/recycling/shoes.svg"
         },
         {
-          "if": "recycling:small_electrical_appliances=yes",
+          "if": {
+            "or": [
+              "recycling:small_appliances=yes",
+              "recycling:small_electrical_appliances=yes"
+            ]
+          },
           "then": "circle:#FFFFFF;./assets/layers/recycling/small_electrical_appliances.svg"
         },
         {
@@ -412,13 +417,26 @@
             "class": "medium"
           }
         },
+        {
+          "if": "recycling:small_appliances=yes",
+          "ifnot": "recycling:small_appliances=",
+          "then": {
+            "en": "Small electrical appliances can be recycled here",
+            "nl": "Kleine elektrische apparaten kunnen hier gerecycled worden"
+          },
+          "icon": {
+            "path": "./assets/layers/recycling/small_electrical_appliances.svg",
+            "class": "medium"
+          }
+        },
         {
           "if": "recycling:small_electrical_appliances=yes",
           "ifnot": "recycling:small_electrical_appliances=",
           "then": {
             "en": "Small electrical appliances can be recycled here",
-            "nl": "Kleine elektronische apparaten kunnen hier gerecycled worden"
+            "nl": "Kleine elektrische apparaten kunnen hier gerecycled worden"
           },
+          "hideInAnswer": true,
           "icon": {
             "path": "./assets/layers/recycling/small_electrical_appliances.svg",
             "class": "medium"
@@ -544,7 +562,12 @@
             "en": "Recycling of green waste",
             "nl": "Recycling van groen afval"
           },
-          "osmTags": "recycling:green_waste=yes"
+          "osmTags": {
+            "or": [
+              "recycling:green_waste=yes",
+              "recycling:organic=yes"
+            ]
+          }
         },
         {
           "question": {
@@ -607,7 +630,12 @@
             "en": "Recycling of small electrical appliances",
             "nl": "Recycling van kleine elektrische apparaten"
           },
-          "osmTags": "recycling:small_electrical_appliances=yes"
+          "osmTags": {
+            "or": [
+              "recycling:small_appliances=yes",
+              "recycling:small_electrical_appliances=yes"
+            ]
+          }
         },
         {
           "question": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index faf063421..a10d84461 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4312,6 +4312,9 @@
                         "then": "Small electrical appliances can be recycled here"
                     },
                     "18": {
+                        "then": "Small electrical appliances can be recycled here"
+                    },
+                    "19": {
                         "then": "Residual waste can be recycled here"
                     }
                 },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 9433aaf7b..23fda94ad 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4101,9 +4101,12 @@
                         "then": "Schoenen kunnen hier gerecycled worden"
                     },
                     "17": {
-                        "then": "Kleine elektronische apparaten kunnen hier gerecycled worden"
+                        "then": "Kleine elektrische apparaten kunnen hier gerecycled worden"
                     },
                     "18": {
+                        "then": "Kleine elektrische apparaten kunnen hier gerecycled worden"
+                    },
+                    "19": {
                         "then": "Restafval kan hier gerecycled worden"
                     }
                 },