diff --git a/langs/layers/en.json b/langs/layers/en.json
index a497a5aa9b..45b9be879b 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3,16 +3,17 @@
         "description": "Addresses",
         "name": "Known addresses in OSM",
         "tagRenderings": {
-            "address_joined": {
-                "render": {
-                    "special": {
-                        "render": "{addr:street} {addr:housenumber}"
-                    }
-                }
-            },
             "fixme": {
                 "question": "What should be fixed here? Please explain"
             },
+            "header": {
+                "mappings": {
+                    "0": {
+                        "then": "No address is known"
+                    }
+                },
+                "render": "{addr:street} <b>{addr:housenumber}</b> {addr:unit}"
+            },
             "housenumber": {
                 "mappings": {
                     "0": {
@@ -24,7 +25,17 @@
             },
             "street": {
                 "question": "What street is this address located in?",
+                "questionHint": "Do not include the house number",
                 "render": "This address is in street <b>{addr:street}</b>"
+            },
+            "unit": {
+                "mappings": {
+                    "0": {
+                        "then": "No unit number"
+                    }
+                },
+                "question": "What is the unit number or letter?",
+                "render": "The unit number is <b>{addr:unit}</b>"
             }
         },
         "title": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 210e73781c..3011a9d4b8 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -6,6 +6,13 @@
             "fixme": {
                 "question": "Wat moet hier gecorrigeerd worden? Leg het uit"
             },
+            "header": {
+                "mappings": {
+                    "0": {
+                        "then": "Geen adresgegevens bekend"
+                    }
+                }
+            },
             "housenumber": {
                 "mappings": {
                     "0": {
@@ -18,6 +25,15 @@
             "street": {
                 "question": "In welke straat bevindt dit adres zich?",
                 "render": "Dit adres bevindt zich in de straat <b>{addr:street}</b>"
+            },
+            "unit": {
+                "mappings": {
+                    "0": {
+                        "then": "Geen apart busnummer of letter"
+                    }
+                },
+                "question": "Wat is het busnummer?",
+                "render": "De bus is <b>{addr:unit}</b>"
             }
         },
         "title": {