diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index 86bc140d2..adb47c168 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -708,6 +708,34 @@
       },
       "icon": "./assets/svg/barrier.svg",
       "width": "5",
+      "presets": [
+        {
+          "title": {
+            "en": "Bollard",
+            "nl": "Paaltje"
+          },
+          "tags": [
+            "barrier=bollard"
+          ],
+          "description": {
+            "en": "A bollard in the road",
+            "nl": "Een paaltje in de weg"
+          }
+        },
+        {
+          "title": {
+            "en": "Cycle barrier",
+            "nl": "Fietshekjes"
+          },
+          "tags": [
+            "barrier=bollard"
+          ],
+          "description": {
+            "en": "Cycle barrier, slowing down cyclists",
+            "nl": "Fietshekjes, voor het afremmen van fietsers"
+          }
+        }
+      ],
       "tagRenderings": [
         {
           "question": {
@@ -775,6 +803,36 @@
             }
           ]
         },
+        {
+          "question": {
+            "en": "What kind of cycling barrier is this?",
+            "nl": "Wat voor fietshekjes zijn dit?"
+          },
+          "condition": "barrier=cycle_barrier",
+          "mappings": [
+            {
+              "if": "cycle_barrier:type=single",
+              "then": {
+                "en": "Single, just two barriers with a space inbetween",
+                "nl": "Enkelvoudig, slechts twee hekjes met ruimte ertussen"
+              }
+            },
+            {
+              "if": "cycle_barrier:type=double",
+              "then": {
+                "en": "Double, two barriers behind each other",
+                "nl": "Dubbel, twee hekjes achter elkaar"
+              }
+            },
+            {
+              "if": "cycle_barrier:type=triple",
+              "then": {
+                "en": "Triple, three barier behind each other",
+                "nl": "Drievoudig, drie hekjes achter elkaar"
+              }
+            }
+          ]
+        },
         {
           "render": {
             "en": "Maximum width: {maxwidth:physical} m",
@@ -784,6 +842,12 @@
             "en": "How wide is the gap left over besides the barrier?",
             "nl": "Hoe breed is de ruimte naast de barrière?"
           },
+          "condition": {
+            "and": [
+              "cycle_barrier:type!=double",
+              "cycle_barrier:type!=triple"
+            ]
+          },
           "freeform": {
             "key": "maxwidth:physical",
             "type": "pfloat"
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 070077cc4..25e46f9ae 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -935,6 +935,16 @@
                         }
                     }
                 },
+                "presets": {
+                    "0": {
+                        "title": "Bollard",
+                        "description": "A bollard in the road"
+                    },
+                    "1": {
+                        "title": "Cycle barrier",
+                        "description": "Cycle barrier, slowing down cyclists"
+                    }
+                },
                 "tagRenderings": {
                     "0": {
                         "question": "Can a bicycle go past this barrier?",
@@ -968,6 +978,20 @@
                         }
                     },
                     "2": {
+                        "question": "What kind of cycling barrier is this?",
+                        "mappings": {
+                            "0": {
+                                "then": "Single, just two barriers with a space inbetween"
+                            },
+                            "1": {
+                                "then": "Double, two barriers behind each other"
+                            },
+                            "2": {
+                                "then": "Triple, three barier behind each other"
+                            }
+                        }
+                    },
+                    "3": {
                         "render": "Maximum width: {maxwidth:physical} m",
                         "question": "How wide is the gap left over besides the barrier?"
                     }
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index 83d4e63e4..bb7e3ad5a 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -739,6 +739,16 @@
                         }
                     }
                 },
+                "presets": {
+                    "0": {
+                        "title": "Paaltje",
+                        "description": "Een paaltje in de weg"
+                    },
+                    "1": {
+                        "title": "Fietshekjes",
+                        "description": "Fietshekjes, voor het afremmen van fietsers"
+                    }
+                },
                 "tagRenderings": {
                     "0": {
                         "question": "Kan een fietser langs deze barrière?",
@@ -772,6 +782,20 @@
                         }
                     },
                     "2": {
+                        "question": "Wat voor fietshekjes zijn dit?",
+                        "mappings": {
+                            "0": {
+                                "then": "Enkelvoudig, slechts twee hekjes met ruimte ertussen"
+                            },
+                            "1": {
+                                "then": "Dubbel, twee hekjes achter elkaar"
+                            },
+                            "2": {
+                                "then": "Drievoudig, drie hekjes achter elkaar"
+                            }
+                        }
+                    },
+                    "3": {
                         "render": "Maximumbreedte: {maxwidth:physical} m",
                         "question": "Hoe breed is de ruimte naast de barrière?"
                     }