diff --git a/langs/layers/en.json b/langs/layers/en.json
index ac297439b..2b397fa17 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -2475,6 +2475,26 @@
             "render": "Drinking water"
         }
     },
+    "etymology": {
+        "description": "All objects which have an etymology known",
+        "name": "Has etymolgy",
+        "tagRenderings": {
+            "simple etymology": {
+                "question": "What is this object named after?<br/><span class='subtle'>This might be written on the street name sign</span>",
+                "render": "Named after {name:etymology}"
+            },
+            "street-name-sign-image": {
+                "render": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Add image of a street name sign)}"
+            },
+            "wikipedia-etymology": {
+                "question": "What is the Wikidata-item that this object is named after?",
+                "render": "<h3>Wikipedia article of the name giver</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}"
+            },
+            "zoeken op inventaris onroerend erfgoed": {
+                "render": "<a href='https://inventaris.onroerenderfgoed.be/erfgoedobjecten?tekst={name}' target='_blank'>Search on inventaris onroerend erfgoed</a>"
+            }
+        }
+    },
     "food": {
         "filter": {
             "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 0ff5387f3..ba9e93be1 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -2421,6 +2421,26 @@
             "render": "Drinkbaar water"
         }
     },
+    "etymology": {
+        "description": "Alle lagen met een gelinkt etymology",
+        "name": "Heeft etymology info",
+        "tagRenderings": {
+            "simple etymology": {
+                "question": "Naar wat is dit object vernoemd?<br/><span class='subtle'>Dit staat mogelijks vermeld op het straatnaambordje</subtle>",
+                "render": "Vernoemd naar {name:etymology}"
+            },
+            "street-name-sign-image": {
+                "render": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}"
+            },
+            "wikipedia-etymology": {
+                "question": "Wat is het Wikidata-item van hetgeen dit object is naar vernoemd?",
+                "render": "<h3>Wikipedia artikel van de naamgever</h3>{wikipedia(name:etymology:wikidata):max-height:20rem}"
+            },
+            "zoeken op inventaris onroerend erfgoed": {
+                "render": "<a href='https://inventaris.onroerenderfgoed.be/erfgoedobjecten?tekst={name}' target='_blank'>Zoeken op inventaris onroerend erfgoed</a>"
+            }
+        }
+    },
     "food": {
         "filter": {
             "0": {
diff --git a/langs/shared-questions/en.json b/langs/shared-questions/en.json
index 709534fcc..384d57e97 100644
--- a/langs/shared-questions/en.json
+++ b/langs/shared-questions/en.json
@@ -78,6 +78,14 @@
                 }
             },
             "question": "Is this place accessible with a wheelchair?"
+        },
+        "wikipedialink": {
+            "mappings": {
+                "0": {
+                    "then": "Not linked with Wikipedia"
+                }
+            },
+            "question": "What is the corresponding item on Wikipedia?"
         }
     }
 }
\ No newline at end of file
diff --git a/langs/shared-questions/nl.json b/langs/shared-questions/nl.json
index 8c7d6b514..433512603 100644
--- a/langs/shared-questions/nl.json
+++ b/langs/shared-questions/nl.json
@@ -78,6 +78,14 @@
                 }
             },
             "question": "Is deze plaats rolstoeltoegankelijk?"
+        },
+        "wikipedialink": {
+            "mappings": {
+                "0": {
+                    "then": "Nog geen Wikipedia-artikel bekend"
+                }
+            },
+            "question": "Welk Wikipedia-artikel beschrijft dit object?"
         }
     }
 }
\ No newline at end of file
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 99694b1f4..cd96da916 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -746,25 +746,9 @@
     "etymology": {
         "description": "On this map, you can see what an object is named after. The streets, buildings, ... come from OpenStreetMap which got linked with Wikidata. The information comes from Wpikipedia.",
         "layers": {
-            "0": {
-                "description": "All objects which have an etymology known",
-                "name": "Has etymolgy",
-                "tagRenderings": {
-                    "simple etymology": {
-                        "render": "Named after {name:etymology}"
-                    },
-                    "street-name-sign-image": {
-                        "render": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Add image of a street name sign)}"
-                    }
-                }
-            },
             "1": {
-                "description": "All objects which have an etymology known",
-                "name": "Has etymolgy",
-                "tagRenderings": {
-                    "simple etymology": {
-                        "render": "Named after {name:etymology}"
-                    }
+                "override": {
+                    "name": "Streets without etymology information"
                 }
             }
         },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index c8ad880ca..7f5ae4fea 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -627,25 +627,9 @@
     "etymology": {
         "description": "Op deze kaart zie je waar een plaats naar is vernoemd. De straten, gebouwen, ... komen uit OpenStreetMap, waar een link naar Wikidata werd gelegd. De informatie komt uit wikipedia.",
         "layers": {
-            "0": {
-                "description": "Alle lagen met een gelinkt etymology",
-                "name": "Heeft etymology info",
-                "tagRenderings": {
-                    "simple etymology": {
-                        "render": "Vernoemd naar {name:etymology}"
-                    },
-                    "street-name-sign-image": {
-                        "render": "{image_carousel(image:streetsign)}<br/>{image_upload(image:streetsign, Voeg afbeelding van straatnaambordje toe)}"
-                    }
-                }
-            },
             "1": {
-                "description": "Alle lagen met een gelinkt etymology",
-                "name": "Heeft etymology info",
-                "tagRenderings": {
-                    "simple etymology": {
-                        "render": "Vernoemd naar {name:etymology}"
-                    }
+                "override": {
+                    "name": "Straten zonder etymologische informatie"
                 }
             }
         },