diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index e2f06be100..47d455bb18 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -726,13 +726,23 @@
       "freeform": {
         "key": "opening_hours",
         "type": "opening_hours"
-      }
+      },
+      "mappings": [
+        {
+          "#": "Just here to be able to handle those ~5000 incorrect 'opening_hours=closed' elements.",
+          "if": "opening_hours=closed",
+          "then": {
+            "en": "Marked as closed for an unspecified time"
+          },
+          "hideInAnswer": true
+        }
+      ]
     },
     {
       "id": "opening_hours_24_7",
       "builtin": "opening_hours",
       "override": {
-        "mappings": [
+        "+mappings": [
           {
             "if": "opening_hours=24/7",
             "then": {
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index 60ace47c25..93561172f3 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -6324,7 +6324,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Obert 24/7 (incloent-hi festius)"
                         }
diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index d646308035..f6b4e1f3ae 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -6553,7 +6553,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Otevřeno 24/7 (včetně svátků)"
                         }
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 7466d52ac4..e1abe4eef9 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -7690,7 +7690,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "durchgehend geöffnet (auch an Feiertagen)"
                         }
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 2fdf6441d9..0a7d8debf9 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -7728,12 +7728,17 @@
                 }
             },
             "opening_hours": {
+                "mappings": {
+                    "0": {
+                        "then": "Marked as closed for an unspecified time"
+                    }
+                },
                 "question": "What are the opening hours of {title()}?",
                 "render": "<h3>Opening hours</h3>{opening_hours_table(opening_hours)}"
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "24/7 opened (including holidays)"
                         }
diff --git a/langs/layers/es.json b/langs/layers/es.json
index cb4b1ebabb..a00de44b86 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -3607,7 +3607,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Abierta 24/7 (incluyendo festivos)"
                         }
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index d342a0c2f1..7970b50e0e 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -4712,7 +4712,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Ouvert 24h/24 (jours fériés compris)"
                         }
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index 35c9b9cc6d..92a8b91571 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -801,7 +801,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Éjjel-nappal nyitva (munkaszüneti napokon is)"
                         }
diff --git a/langs/layers/id.json b/langs/layers/id.json
index 5daff07d92..b33cd73a2c 100644
--- a/langs/layers/id.json
+++ b/langs/layers/id.json
@@ -515,7 +515,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Buka 24 jam (termasuk hari libur)"
                         }
diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json
index 5d33f4964a..1bdf05dd2e 100644
--- a/langs/layers/nb_NO.json
+++ b/langs/layers/nb_NO.json
@@ -654,7 +654,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Døgnåpent (inkludert helligdager)"
                         }
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 2e89177841..103eb5db36 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -6550,7 +6550,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "24/7 open (ook tijdens feestdagen)"
                         }
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index 2fb3b184ec..685d029752 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -2424,7 +2424,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "Otwarte 24/7 (również w święta)"
                         }
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index a95bcf4597..f4f16ce608 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -634,7 +634,7 @@
             },
             "opening_hours_24_7": {
                 "override": {
-                    "mappings": {
+                    "+mappings": {
                         "0": {
                             "then": "24/7 開放 (包括假日)"
                         }