diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index 443c1f705..7f0b01743 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -103,7 +103,9 @@
     },
     {
       "id": "wikipedia-etymology",
-      "condition": "name:etymology!=unknown",
+      "condition": {
+        "and":["name:etymology!=unknown"]
+      },
       "question": {
         "en": "What is the Wikidata-item that this object is named after?",
         "nl": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?",
diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json
index 3695e7055..36e0aeebf 100644
--- a/assets/layers/indoors/indoors.json
+++ b/assets/layers/indoors/indoors.json
@@ -563,7 +563,15 @@
         "type": "pnat"
       }
     },
-    "etymology.wikipedia-etymology",
+    {
+      "builtin": "etymology.wikipedia-etymology",
+      "override": {
+        "condition": {
+          "and+": "name~*"
+        }
+      }
+    },
+
     {
       "builtin": "toilet.relevant-questions",
       "override": {