diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 3fac8865b5..94c75cbdad 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -155,7 +155,10 @@
                 "nl": "Er is geen fietspad aanwezig"
               },
               "hideInAnswer": "cycleway!=opposite",
-              "addExtraTags": ["oneway:bicycle=no", "fixme=Changed from cycleway=opposite"]
+              "addExtraTags": [
+                "oneway:bicycle=no",
+                "fixme=Changed from cycleway=opposite"
+              ]
             }
           ]
         },
@@ -214,7 +217,10 @@
                 "en": "This is a cyclestreet, and a 30km/h zone.",
                 "nl": "Dit is een fietstraat, en dus een 30km/h zone"
               },
-              "addExtraTags": ["overtaking:motor_vehicle=no", "maxspeed=30"],
+              "addExtraTags": [
+                "overtaking:motor_vehicle=no",
+                "maxspeed=30"
+              ],
               "hideInAnswer": "_country!=be"
             },
             {
@@ -231,7 +237,9 @@
                 "en": "This is not a cyclestreet.",
                 "nl": "Dit is niet een fietstraat"
               },
-              "addExtraTags": ["overtaking:motor_vehicle="]
+              "addExtraTags": [
+                "overtaking:motor_vehicle="
+              ]
             }
           ]
         },
@@ -602,7 +610,12 @@
             "nl": "Hoe breed is de ruimte tussen het fietspad en de weg?"
           },
           "condition": {
-            "or": ["cycleway=track", "cycleway=lane", "highway=cycleway", "highway=path"]
+            "or": [
+              "cycleway=track",
+              "cycleway=lane",
+              "highway=cycleway",
+              "highway=path"
+            ]
           },
           "freeform": {
             "key": "cycleway:buffer",
@@ -768,7 +781,10 @@
                 "nl": "Er is geen fietspad aanwezig"
               },
               "hideInAnswer": "cycleway!=opposite",
-              "addExtraTags": ["oneway:bicycle=no", "fixme=Changed from cycleway=opposite"]
+              "addExtraTags": [
+                "oneway:bicycle=no",
+                "fixme=Changed from cycleway=opposite"
+              ]
             }
           ],
           "render": {
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 1c260fd200..2cc532c274 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -737,9 +737,11 @@
                             },
                             "4": {
                                 "then": "There is no cycleway"
+                            },
+                            "5": {
+                                "then": "There is no cycleway"
                             }
-                        },
-                        "render": "Unknown cycleway situation"
+                        }
                     },
                     "1": {
                         "question": "Is this street lit?",
@@ -762,7 +764,13 @@
                         "question": "Is this a cyclestreet?",
                         "mappings": {
                             "0": {
-                                "then": "This is a cyclestreet."
+                                "then": "This is a cyclestreet, and a 30km/h zone."
+                            },
+                            "1": {
+                                "then": "This is a cyclestreet"
+                            },
+                            "2": {
+                                "then": "This is not a cyclestreet."
                             }
                         }
                     },
@@ -898,12 +906,16 @@
                                 "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>"
                             },
                             "1": {
-                                "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>'"
+                                "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>"
                             },
                             "2": {
-                                "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>'"
+                                "then": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>"
                             }
                         }
+                    },
+                    "10": {
+                        "render": "The buffer besides this cycleway is {cycleway:buffer} m",
+                        "question": "How wide is the gap between the cycleway and the road?"
                     }
                 }
             },
@@ -933,6 +945,12 @@
                                 "then": "This is a cyclestreet."
                             },
                             "5": {
+                                "then": "There is no cycleway known here"
+                            },
+                            "6": {
+                                "then": "There is no cycleway"
+                            },
+                            "7": {
                                 "then": "There is no cycleway"
                             }
                         },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index f6b0d5956f..70b6a208d0 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -592,10 +592,12 @@
                                 "then": "Er is een apart getekend fietspad."
                             },
                             "4": {
-                                "then": "Er is geen fietspad"
+                                "then": "Er is geen fietspad aanwezig"
+                            },
+                            "5": {
+                                "then": "Er is geen fietspad aanwezig"
                             }
-                        },
-                        "render": "Onbekende fietspad situatie"
+                        }
                     },
                     "1": {
                         "question": "Is deze weg verlicht?",
@@ -618,7 +620,13 @@
                         "question": "Is dit een fietsstraat?",
                         "mappings": {
                             "0": {
+                                "then": "Dit is een fietstraat, en dus een 30km/h zone"
+                            },
+                            "1": {
                                 "then": "Dit is een fietstraat"
+                            },
+                            "2": {
+                                "then": "Dit is niet een fietstraat"
                             }
                         }
                     },
@@ -702,12 +710,16 @@
                                 "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>"
                             },
                             "1": {
-                                "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>'"
+                                "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D09.svg' style='height: 3em'>"
                             },
                             "2": {
-                                "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>'"
+                                "then": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D10.svg' style='height: 3em'>"
                             }
                         }
+                    },
+                    "10": {
+                        "render": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
+                        "question": "Hoe breed is de ruimte tussen het fietspad en de weg?"
                     }
                 }
             },
@@ -737,7 +749,13 @@
                                 "then": "Dit is een fietsstraat."
                             },
                             "5": {
-                                "then": "Er is geen fietspad"
+                                "then": "Er is geen fietspad bekend hier"
+                            },
+                            "6": {
+                                "then": "Er is geen fietspad aanwezig"
+                            },
+                            "7": {
+                                "then": "Er is geen fietspad aanwezig"
                             }
                         },
                         "render": "Onbekende fietspad situatie"