diff --git a/langs/en.json b/langs/en.json
index 2d1dcd4d81..3eef2f3f32 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -252,6 +252,15 @@
         },
         "pickLanguage": "Choose a language: ",
         "poweredByOsm": "Powered by OpenStreetMap",
+        "questionBox": {
+            "answeredMultipleSkippedMultiple": "You answered {answered} questions and skipped {skipped} questions",
+            "answeredMultipleSkippedOne": "You answered {answered} questions and skipped one question",
+            "answeredOne": "You answered one question",
+            "answeredOneSkippedMultiple": "You answered one question and skipped {skipped} questions",
+            "answeredOneSkippedOne": "You answered one and skipped one question",
+            "reactivate": "Reactive skipped questions",
+            "skippedOne": "You skipped one question"
+        },
         "questions": {
             "emailIs": "The email address of this {category} is <a href='mailto:{email}' target='_blank'>{email}</a>",
             "emailOf": "What is the email address of {category}?",
@@ -260,15 +269,6 @@
             "websiteIs": "Website: <a href='{website}' target='_blank'>{website}</a>",
             "websiteOf": "What is the website of {category}?"
         },
-        "questionBox": {
-            "skippedOne": "You skipped one question",
-            "reactivate": "Reactive skipped questions",
-            "answeredOne": "You answered one question",
-            "answeredOneSkippedOne": "You answered one and skipped one question",
-            "answeredOneSkippedMultiple": "You answered one question and skipped {skipped} questions",
-            "answeredMultipleSkippedMultiple": "You answered {answered} questions and skipped {skipped} questions",
-            "answeredMultipleSkippedOne": "You answered {answered} questions and skipped one question"
-        },
         "readYourMessages": "Please, read all your OpenStreetMap-messages before adding a new feature.",
         "removeLocationHistory": "Delete the location history",
         "returnToTheMap": "Return to the map",
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 8b5e67af5a..7f58a3b443 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -2313,8 +2313,8 @@
                 "question": "Welche Leistung bietet ein einzelner Stecker vom Typ <div style='display: inline-block'><b><b>Typ 2 mit Kabel</b> (Mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>?",
                 "render": "<div style='display: inline-block'><b><b>Typ 2 mit Kabel</b> (Mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> liefert maximal {socket:type2_cable:output}"
             },
-            "questions": {
-                "render": "<h3>Technische Fragen</h3>Die folgenden Fragen sind sehr technisch. Sie können sie gerne ignorieren<br/>{questions}"
+            "questions_technical": {
+                "render": "<h3>Technische Fragen</h3>Die folgenden Fragen sind sehr technisch. Sie können sie gerne ignorieren<br/>{questions(technical)}"
             },
             "ref": {
                 "question": "Welche Kennnummer hat die Ladestation?",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 997701317b..39e94e9121 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -2313,8 +2313,8 @@
                 "question": "What power output does a single plug of type <div style='display: inline-block'><b><b>Type 2 with cable</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> offer?",
                 "render": "<div style='display: inline-block'><b><b>Type 2 with cable</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> outputs at most {socket:type2_cable:output}"
             },
-            "questions": {
-                "render": "<h3>Technical questions</h3>The questions below are very technical. Feel free to ignore them<br/>{questions}"
+            "questions_technical": {
+                "render": "<h3>Technical questions</h3>The questions below are very technical. Feel free to ignore them<br/>{questions(technical)}"
             },
             "ref": {
                 "question": "What is the reference number of this charging station?",
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index d5937d9392..f2de7d01a8 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -2316,8 +2316,8 @@
                 "question": "Welk vermogen levert een enkele stekker van type <div style='display: inline-block'><b><b>Type 2 met kabel</b> (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div>?",
                 "render": "<div style='display: inline-block'><b><b>Type 2 met kabel</b> (J1772)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> levert een vermogen van maximaal {socket:type2_cable:output}"
             },
-            "questions": {
-                "render": "<h3>Technische vragen</h3>De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt<br/>{questions}"
+            "questions_technical": {
+                "render": "<h3>Technische vragen</h3>De vragen hieronder zijn erg technisch - sla deze over indien je hier geen tijd voor hebt<br/>{questions(technical)}"
             },
             "ref": {
                 "question": "Wat is het referentienummer van dit oplaadstation?",
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 3f94f618ba..88fe9753a8 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -857,8 +857,8 @@
             },
             "1": {
                 "override": {
-                    "tagRenderings": {
-                        "link_to_more": {
+                    "tagRenderings+": {
+                        "0": {
                             "render": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
                         }
                     }