diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json
index c35a4fa15e..fcc1289b5a 100644
--- a/assets/themes/cycle_infra/cycle_infra.json
+++ b/assets/themes/cycle_infra/cycle_infra.json
@@ -585,7 +585,8 @@
               },
               "hideInAnswer": "_country!=be",
               "addExtraTags": [
-                "segregated=yes"
+                "cycleway:foot=designated",
+                "cycleway:segregated=yes"
               ]
             },
             {
@@ -596,7 +597,8 @@
               },
               "hideInAnswer": "_country!=be",
               "addExtraTags": [
-                "segregated=no"
+                "cycleway:foot=designated",
+                "cycleway:segregated=no"
               ]
             },
             {
@@ -626,7 +628,13 @@
                 "en": "Compulsory cycleway <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>",
                 "nl": "Verplicht fietspad <img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 3em'>"
               },
-              "hideInAnswer": "_country!=be"
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "bicycle=designated",
+                "mofa=designated",
+                "moped=yes",
+                "speed_pedelec=yes"
+              ]
             },
             {
               "if": "traffic_sign=BE:D9",
@@ -636,6 +644,11 @@
               },
               "hideInAnswer": "_country!=be",
               "addExtraTags": [
+                "foot=designated",
+                "bicycle=designated",
+                "mofa=designated",
+                "moped=no",
+                "speed_pedelec=no",
                 "segregated=yes"
               ]
             },
@@ -647,11 +660,16 @@
               },
               "hideInAnswer": "_country!=be",
               "addExtraTags": [
+                "foot=designated",
+                "bicycle=designated",
+                "mofa=designated",
+                "moped=no",
+                "speed_pedelec=no",
                 "segregated=no"
               ]
             },
             {
-              "if": "cycleway:traffic_sign=none",
+              "if": "traffic_sign=none",
               "then": {
                 "en": "No traffic sign present",
                 "nl": "Geen verkeersbord aanwezig"
@@ -659,6 +677,174 @@
             }
           ]
         },
+        {
+          "question": {
+            "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) have a supplementary sign?",
+            "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) een onderbord?"
+          },
+          "condition": "cycleway:traffic_sign=BE:D7",
+          "mappings": [
+            {
+              "if": "cycleway:traffic_sign=BE:D7;BE:M6",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "cycleway:moped=designated"
+              ]
+            },
+            {
+              "if": "cycleway:traffic_sign=BE:D7;BE:M13",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "cycleway:speed_pedelec=designated"
+              ]
+            },
+            {
+              "if": "cycleway:traffic_sign=BE:D7;BE:M14",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "cycleway:moped=designated",
+                "cycleway:speed_pedelec=designated"
+              ]
+            },
+            {
+              "if": "cycleway:traffic_sign=BE:D7;BE:M7",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "cycleway:moped=no"
+              ]
+            },
+            {
+              "if": "cycleway:traffic_sign=BE:D7;BE:M15",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "cycleway:speed_pedelec=no"
+              ]
+            },
+            {
+              "if": "cycleway:traffic_sign=BE:D7;BE:M16",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "cycleway:moped=designated",
+                "cycleway:speed_pedelec=no"
+              ]
+            },
+            {
+              "if": "cycleway:traffic_sign:supplementary=none",
+              "then": {
+                "en": "No supplementary traffic sign present",
+                "nl": "Geen onderbord aanwezig"
+              }
+            }
+          ]
+        },
+        {
+          "question": {
+            "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) have a supplementary sign?",
+            "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) een onderbord?"
+          },
+          "condition": "traffic_sign=BE:D7",
+          "mappings": [
+            {
+              "if": "traffic_sign=BE:D7;BE:M6",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "moped=designated"
+              ]
+            },
+            {
+              "if": "traffic_sign=BE:D7;BE:M13",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "speed_pedelec=designated"
+              ]
+            },
+            {
+              "if": "traffic_sign=BE:D7;BE:M14",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "moped=designated",
+                "speed_pedelec=designated"
+              ]
+            },
+            {
+              "if": "traffic_sign=BE:D7;BE:M7",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "moped=no"
+              ]
+            },
+            {
+              "if": ":traffic_sign=BE:D7;BE:M15",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "speed_pedelec=no"
+              ]
+            },
+            {
+              "if": "traffic_sign=BE:D7;BE:M16",
+              "then": {
+                "en": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>",
+                "nl": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
+              },
+              "hideInAnswer": "_country!=be",
+              "addExtraTags": [
+                "moped=designated",
+                "speed_pedelec=no"
+              ]
+            },
+            {
+              "if": "traffic_sign:supplementary=none",
+              "then": {
+                "en": "No supplementary traffic sign present",
+                "nl": "Geen onderbord aanwezig"
+              }
+            }
+          ]
+        },
         {
           "render": {
             "en": "The buffer besides this cycleway is {cycleway:buffer} m",
diff --git a/assets/themes/cycle_infra/license_info.json b/assets/themes/cycle_infra/license_info.json
index dca558b1fc..ed362f0a3a 100644
--- a/assets/themes/cycle_infra/license_info.json
+++ b/assets/themes/cycle_infra/license_info.json
@@ -29,6 +29,66 @@
       "https://commons.wikimedia.org/wiki/File:Belgian_road_sign_D10.svg"
     ]
   },
+  {
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "path": "Belgian_traffic_sign_M6.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M6.svg"
+    ]
+  },
+  {
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "path": "Belgian_traffic_sign_M7.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M7.svg"
+    ]
+  },
+  {
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "path": "Belgian_traffic_sign_M13.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M13.svg"
+    ]
+  },
+  {
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "path": "Belgian_traffic_sign_M14.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M14.svg"
+    ]
+  },
+  {
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "path": "Belgian_traffic_sign_M15.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M15.svg"
+    ]
+  },
+  {
+    "authors": [
+      "Belgische Wetgever"
+    ],
+    "path": "Belgian_traffic_sign_M16.svg",
+    "license": "CC0",
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Belgian_traffic_sign_M16.svg"
+    ]
+  },
   {
     "authors": [
       "Supaplex030"
diff --git a/langs/themes/en.json b/langs/themes/en.json
index a6a96f2d0a..6fabda6ed1 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -934,10 +934,62 @@
                         }
                     },
                     "11": {
+                        "question": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) have a supplementary sign?",
+                        "mappings": {
+                            "0": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
+                            },
+                            "1": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
+                            },
+                            "2": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
+                            },
+                            "3": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
+                            },
+                            "4": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
+                            },
+                            "5": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
+                            },
+                            "6": {
+                                "then": "No supplementary traffic sign present"
+                            }
+                        }
+                    },
+                    "12": {
+                        "question": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) have a supplementary sign?",
+                        "mappings": {
+                            "0": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
+                            },
+                            "1": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
+                            },
+                            "2": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
+                            },
+                            "3": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
+                            },
+                            "4": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
+                            },
+                            "5": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
+                            },
+                            "6": {
+                                "then": "No supplementary traffic sign present"
+                            }
+                        }
+                    },
+                    "13": {
                         "render": "The buffer besides this cycleway is {cycleway:buffer} m",
                         "question": "How wide is the gap between the cycleway and the road?"
                     },
-                    "12": {
+                    "14": {
                         "question": "How is this cycleway seperated from the road?",
                         "mappings": {
                             "0": {
@@ -954,7 +1006,7 @@
                             }
                         }
                     },
-                    "13": {
+                    "15": {
                         "question": "How is this cycleway seperated from the road?",
                         "mappings": {
                             "0": {
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index a7ea79a126..3f20598ae6 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -738,10 +738,62 @@
                         }
                     },
                     "11": {
+                        "question": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) een onderbord?",
+                        "mappings": {
+                            "0": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
+                            },
+                            "1": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
+                            },
+                            "2": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
+                            },
+                            "3": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
+                            },
+                            "4": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
+                            },
+                            "5": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
+                            },
+                            "6": {
+                                "then": "Geen onderbord aanwezig"
+                            }
+                        }
+                    },
+                    "12": {
+                        "question": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='height: 1.5em'>) een onderbord?",
+                        "mappings": {
+                            "0": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M6.svg' style='height: 3em'>"
+                            },
+                            "1": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M13.svg' style='height: 3em'>"
+                            },
+                            "2": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M14.svg' style='height: 3em'>"
+                            },
+                            "3": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M7.svg' style='height: 3em'>"
+                            },
+                            "4": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M15.svg' style='height: 3em'>"
+                            },
+                            "5": {
+                                "then": "<img src='./assets/themes/cycle_infra/Belgian_traffic_sign_M16.svg' style='height: 3em'>"
+                            },
+                            "6": {
+                                "then": "Geen onderbord aanwezig"
+                            }
+                        }
+                    },
+                    "13": {
                         "render": "De schrikafstand van dit fietspad is {cycleway:buffer} m",
                         "question": "Hoe breed is de ruimte tussen het fietspad en de weg?"
                     },
-                    "12": {
+                    "14": {
                         "question": "Hoe is dit fietspad gescheiden van de weg?",
                         "mappings": {
                             "0": {
@@ -758,7 +810,7 @@
                             }
                         }
                     },
-                    "13": {
+                    "15": {
                         "question": "Hoe is dit fietspad gescheiden van de weg?",
                         "mappings": {
                             "0": {