diff --git a/assets/layers/tactile_model/tactile_model.json b/assets/layers/tactile_model/tactile_model.json
index 495afcf8b1..85a75d0e85 100644
--- a/assets/layers/tactile_model/tactile_model.json
+++ b/assets/layers/tactile_model/tactile_model.json
@@ -7,6 +7,9 @@
     "it": "Modelli tattili",
     "cs": "Hmatové modely"
   },
+  "title": {
+    "en": "Tactile model"
+  },
   "description": {
     "en": "Layer showing tactile models, three-dimensional models of the surrounding area.",
     "de": "Ebene mit dreidimensionalen ertastbaren Modellen der Umgebung.",
@@ -63,30 +66,16 @@
   "tagRenderings": [
     "images",
     {
-      "id": "description",
+      "id": "subject",
       "question": {
-        "en": "What does this tactile model show?",
-        "de": "Was zeigt dieses taktile Modell?",
-        "ca": "Què mostra aquest model tàctil?",
-        "it": "Cosa mostra questo modello tattile?",
-        "cs": "Co tento hmatový model ukazuje?"
+        "en": "What is depicted by this model?"
       },
       "freeform": {
-        "key": "blind:description:en",
-        "placeholder": {
-          "en": "e.g. Tactile model of the city center",
-          "de": "z.B. Taktiles Modell des Stadtzentrums",
-          "ca": "P. ex. Model tàctil del centre de la ciutat",
-          "it": "es. Modello tattile del centro città",
-          "cs": "např. hmatový model centra města"
-        }
+        "key": "subject:wikidata",
+        "type": "wikidata"
       },
       "render": {
-        "en": "Description: {blind:description:en}.",
-        "de": "Beschreibung: {blind:description:en}.",
-        "ca": "Descripció: {blind:description:en}.",
-        "it": "Descrizione: {blind:description:en}.",
-        "cs": "Popis: {blind:description:en}."
+        "*": "{wikipedia(subject:wikidata)}"
       }
     },
     {
@@ -143,11 +132,11 @@
             "cs": "Tento model má popis v Braillově písmu v {language()}"
           },
           "render_single_language": {
-            "en": "This model has a braille description in {language}",
-            "de": "Dieses Modell hat eine Beschreibung in Brailleschrift in {language}",
-            "ca": "Aquest model té una descripció en braille en {language}",
-            "it": "Questo modello ha una descrizione in braille in {language}",
-            "cs": "Tento model má popis v Braillově písmu v {language}"
+            "en": "This model has a braille description in {language()}",
+            "de": "Dieses Modell hat eine Beschreibung in Brailleschrift in {language()}",
+            "ca": "Aquest model té una descripció en braille en {language()}",
+            "it": "Questo modello ha una descrizione in braille in {language()}",
+            "cs": "Tento model má popis v Braillově písmu v {language()}"
           }
         }
       }
@@ -161,6 +150,9 @@
         "it": "Ci sono lettere in rilievo che descrivono il modello?",
         "cs": "Je tu text vystouplými písmeny popisující model?"
       },
+      "questionHint": {
+        "en": "Embossed letters are letters as normally read by seeing people, but which are protrude from the surface and might thus also be read by blind people"
+      },
       "mappings": [
         {
           "if": "embossed_letters=yes",
@@ -206,11 +198,11 @@
             "cs": "Tento model má text vystouplými písmeny v {language()}"
           },
           "render_single_language": {
-            "en": "This model has embossed letters in {language}",
-            "de": "Dieses Modell hat geprägte Buchstaben in {language}",
-            "ca": "Aquest model té lletres en relleu en {language}",
-            "it": "Questo modello ha lettere in rilievo in {language}",
-            "cs": "Tento model má text vystouplými písmeny v {language}"
+            "en": "This model has embossed letters in {language()}",
+            "de": "Dieses Modell hat geprägte Buchstaben in {language()}",
+            "ca": "Aquest model té lletres en relleu en {language()}",
+            "it": "Questo modello ha lettere in rilievo in {language()}",
+            "cs": "Tento model má text vystouplými písmeny v {language()}"
           }
         }
       }
@@ -242,6 +234,34 @@
         "cs": "Tento model má měřítko {scale}."
       }
     },
+    {
+      "id": "description",
+      "question": {
+        "en": "What does this tactile model show?",
+        "de": "Was zeigt dieses taktile Modell?",
+        "ca": "Què mostra aquest model tàctil?",
+        "it": "Cosa mostra questo modello tattile?",
+        "cs": "Co tento hmatový model ukazuje?"
+      },
+      "freeform": {
+        "key": "blind:description:en",
+        "placeholder": {
+          "en": "e.g. Tactile model of the city center",
+          "de": "z.B. Taktiles Modell des Stadtzentrums",
+          "ca": "P. ex. Model tàctil del centre de la ciutat",
+          "it": "es. Modello tattile del centro città",
+          "cs": "např. hmatový model centra města"
+        }
+      },
+      "render": {
+        "en": "Description: {blind:description:en}.",
+        "de": "Beschreibung: {blind:description:en}.",
+        "ca": "Descripció: {blind:description:en}.",
+        "it": "Descrizione: {blind:description:en}.",
+        "cs": "Popis: {blind:description:en}."
+      }
+    },
+
     "website"
   ],
   "deletion": true,