diff --git a/data/deprecated.json b/data/deprecated.json
index 173bacf11..7f2401dcc 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -730,10 +730,6 @@
     "old": {"highway": "bridleway", "horse": "no"},
     "replace": {"highway": "path", "horse": "no"}
   },
-  {
-    "old": {"highway": "cycleway", "bicycle": "no"},
-    "replace": {"highway": "path", "bicycle": "no"}
-  },
   {
     "old": {"highway": "cycleway", "cycleway": "track"},
     "replace": {"highway": "cycleway"}
diff --git a/data/presets/highway/cycleway/_bicycle_no.json b/data/presets/highway/cycleway/_bicycle_no.json
new file mode 100644
index 000000000..efc9a5b5f
--- /dev/null
+++ b/data/presets/highway/cycleway/_bicycle_no.json
@@ -0,0 +1,18 @@
+{
+    "locationSet": {
+        "exclude": [
+            "NL"
+        ]
+    },
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "cycleway",
+        "bicycle": "no"
+    },
+    "searchable": false,
+    "matchScore": 1,
+    "name": "Cycleway (NO)",
+    "replacement": "highway/path/bicycle_no"
+}
diff --git a/data/presets/highway/cycleway/moped_link-NL.json b/data/presets/highway/cycleway/moped_link-NL.json
new file mode 100644
index 000000000..cabf836e3
--- /dev/null
+++ b/data/presets/highway/cycleway/moped_link-NL.json
@@ -0,0 +1,35 @@
+{
+    "locationSet": {
+        "include": [
+            "nl"
+        ]
+    },
+    "icon": "fas-moped",
+    "fields": [
+        "name",
+        "oneway",
+        "surface",
+        "smoothness",
+        "width",
+        "structure",
+        "access",
+        "incline"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "cycleway",
+        "bicycle": "no",
+        "moped": "designated"
+    },
+    "addTags": {
+        "highway": "cycleway",
+        "bicycle": "no",
+        "moped": "designated",
+        "foot": "no",
+        "mofa": "no"
+    },
+    "matchScore": 0.9,
+    "name": "Moped Link"
+}
diff --git a/data/presets/highway/path/_bicycle_no.json b/data/presets/highway/path/_bicycle_no.json
new file mode 100644
index 000000000..828a58655
--- /dev/null
+++ b/data/presets/highway/path/_bicycle_no.json
@@ -0,0 +1,11 @@
+{
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "path",
+        "bicycle": "no"
+    },
+    "matchScore": 0,
+    "name": "Path"
+}