diff --git a/assets/layers/etymology/etymology.json b/assets/layers/etymology/etymology.json
index 5182f5380c..216e9a87da 100644
--- a/assets/layers/etymology/etymology.json
+++ b/assets/layers/etymology/etymology.json
@@ -24,6 +24,12 @@
         "nl": "Alle lagen met een gelinkt etymology"
     },
     "tagRenderings": [
+    	{
+    		"id":"etymology-images-from-wikipedia",
+    		"render": {
+    			"*": "{image_carousel(name:etymology:wikidata)}"
+    		}
+    	},
         {
             "id": "wikipedia-etymology",
             "question": {
@@ -62,7 +68,8 @@
             "render": {
                 "en": "<h3>Wikipedia article of the name giver</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}",
                 "nl": "<h3>Wikipedia artikel van de naamgever</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}"
-            }
+            },
+            "condition":"name:etymology!=unknown"
         },
         {
             "id": "zoeken op inventaris onroerend erfgoed",
@@ -85,6 +92,13 @@
             "freeform": {
                 "key": "name:etymology"
             },
+            "mappings": [
+                {"if":"name:etymology=unknown",
+                "then": {
+                    "en": "The origin of this name is unknown in all literature",
+                    "nl": "De oorsprong van deze naam is onbekend in de literatuur"
+                }}
+            ],
             "condition": {
                 "or": [
                     "name:etymology~*",
@@ -135,4 +149,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}