diff --git a/assets/layers/toilet/toilet.json b/assets/layers/toilet/toilet.json
index 861637781..d84e25508 100644
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@@ -257,8 +257,8 @@
           "alsoShowIf": "access=public",
           "then": {
             "en": "Public access",
-            "de": "Der Zugang ist öffentlich",
-            "fr": "Accès public",
+            "de": "Öffentlicher Zugang",
+            "fr": "Accès publique",
             "nl": "Publiek toegankelijk",
             "it": "Accesso pubblico",
             "ru": "Свободный доступ",
@@ -267,37 +267,7 @@
             "ca": "Accés públic",
             "cs": "Veřejný přístup",
             "uk": "Публічний доступ",
-            "en": "Public access",
-            "de": "Öffentlicher Zugang",
-            "fr": "Accès publique",
-            "nl": "Publiek toegankelijk",
-            "it": "Accesso pubblico",
-            "ru": "Свободный доступ",
-            "es": "Acceso público",
-            "da": "Offentlig adgang",
-            "ca": "Accés públic",
-            "cs": "Veřejný přístup",
-            "en": "Public access",
-            "de": "Der Zugang ist öffentlich",
-            "fr": "Accès publique",
-            "nl": "Publiek toegankelijk",
-            "it": "Accesso pubblico",
-            "ru": "Свободный доступ",
-            "es": "Acceso público",
-            "da": "Offentlig adgang",
-            "ca": "Accés públic",
-            "cs": "Veřejný přístup",
-            "sl": "Javno dostopno",
-            "en": "Public access",
-            "de": "Öffentlicher Zugang",
-            "fr": "Accès publique",
-            "nl": "Publiek toegankelijk",
-            "it": "Accesso pubblico",
-            "ru": "Свободный доступ",
-            "es": "Acceso público",
-            "da": "Offentlig adgang",
-            "ca": "Accés públic",
-            "cs": "Veřejný přístup"
+            "sl": "Javno dostopno"
           }
         },
         {
@@ -378,8 +348,7 @@
         "ca": "Aquest serveis són gratuïts?",
         "cs": "Jsou tyto toalety zdarma?",
         "es": "¿Son estos baños de uso gratuito?",
-        "sl": "Ali so ta stranišča brezplačna za uporabo?",
-        "es": "¿Son estos baños de uso gratuito?"
+        "sl": "Ali so ta stranišča brezplačna za uporabo?"
       },
       "mappings": [
         {
@@ -394,7 +363,6 @@
             "da": "Det er betalingstoiletter",
             "ca": "Aquests serveis són de pagament",
             "cs": "Jedná se o placené toalety",
-            "cs": "Jedná se o placené toalety",
             "sl": "To so plačljiva stranišča"
           },
           "if": "fee=yes"
@@ -1159,8 +1127,7 @@
       }
     },
     {
-      "builtin":
-    "description",
+      "builtin": "description",
       "override": {
         "labels": [
           "amenity-no-prefix",
@@ -1510,10 +1477,10 @@
       "override": {
         "labels+": [
           "hidden",
-        "prefixed",
+          "prefixed",
           "adult-changing-table",
           "amenity-prefixed"
-      ],
+        ],
         "condition": {
           "and": [
             "changing_table:adult=yes"
diff --git a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
index 0d093ab5d..c3b4091ed 100644
--- a/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
+++ b/test/Models/ThemeConfig/Conversion/PrepareTheme.spec.ts
@@ -132,7 +132,7 @@ describe("PrepareTheme", () => {
     it("should remove names which are overriden with null", () => {
         const testLayer: LayerConfigJson = {
             source: {
-                osmTags: "x=y",
+                osmTags: { "and": ["x=y"] }
             },
             id: "layer-example",
             name: {