diff --git a/data/presets.yaml b/data/presets.yaml
index 6c7604190..d11019be5 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -691,6 +691,9 @@ en:
       fireplace:
         # fireplace=*
         label: Fireplace
+      fishing:
+        # fishing=*
+        label: Fishing
       fitness_station:
         # fitness_station=*
         label: Equipment Type
diff --git a/data/presets/fields.json b/data/presets/fields.json
index aaa429707..34edfb010 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -126,6 +126,7 @@
     "fire_hydrant/pressure": {"key": "fire_hydrant:pressure", "type": "combo", "label": "Pressure (bar)", "snake_case": false},
     "fire_hydrant/type": {"key": "fire_hydrant:type", "type": "combo", "label": "Shape", "strings": {"options": {"pillar": "Pillar/Aboveground", "underground": "Underground", "wall": "Wall", "pipe": "Capped Pipe"}}},
     "fireplace": {"key": "fireplace", "type": "check", "label": "Fireplace"},
+    "fishing": {"key": "fishing", "type": "combo", "label": "Fishing"},
     "fitness_station": {"key": "fitness_station", "type": "typeCombo", "label": "Equipment Type"},
     "fixme": {"key": "fixme", "type": "textarea", "label": "Fix Me", "universal": true},
     "flag/type": {"key": "flag:type", "type": "combo", "label": "Flag Type"},
diff --git a/data/presets/fields/fishing.json b/data/presets/fields/fishing.json
new file mode 100644
index 000000000..4b43bf41b
--- /dev/null
+++ b/data/presets/fields/fishing.json
@@ -0,0 +1,5 @@
+{
+    "key": "fishing",
+    "type": "combo",
+    "label": "Fishing"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 38ad9600e..fc4f1a11e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -576,7 +576,7 @@
     "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
     "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
     "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
-    "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
+    "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
     "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["opening_hours", "fee", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
     "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["studio", "asanas", "modern yoga", "meditation"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
     "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref"], "moreFields": ["opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "removeTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"},
@@ -714,7 +714,7 @@
     "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
     "natural/valley": {"icon": "maki-triangle-stroked", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gully", "gulley", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"},
     "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"},
-    "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
+    "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
     "natural/water/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"natural": "water", "water": "basin"}, "reference": {"key": "water", "value": "basin"}, "terms": ["detention", "drain", "overflow", "rain", "retention"], "name": "Basin"},
     "natural/water/canal": {"icon": "iD-waterway-canal", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"},
     "natural/water/lake": {"icon": "maki-water", "fields": ["{natural/water}", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"},
@@ -1001,7 +1001,7 @@
     "shop/nutrition_supplements": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
     "shop/optician": {"icon": "maki-optician", "geometry": ["point", "area"], "terms": ["eye", "glasses"], "tags": {"shop": "optician"}, "name": "Optician"},
     "shop/organic": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "name": "Organic Goods Store"},
-    "shop/outdoor": {"icon": "temaki-compass", "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking", "outfitter", "outdoor equipment", "outdoor supplies"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
+    "shop/outdoor": {"icon": "temaki-compass", "fields": ["{shop}", "clothes"], "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking", "outfitter", "outdoor equipment", "outdoor supplies"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
     "shop/paint": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint"}, "name": "Paint Store"},
     "shop/party": {"icon": "fas-mask", "geometry": ["point", "area"], "terms": ["balloons", "costumes", "decorations", "invitations"], "tags": {"shop": "party"}, "name": "Party Supply Store"},
     "shop/pastry": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "pastry"}, "terms": ["patisserie", "cake shop", "cakery"], "name": "Pastry Shop"},
@@ -1126,7 +1126,7 @@
     "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
     "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
-    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent", "lock"], "moreFields": ["salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
+    "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "width", "intermittent", "lock"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
     "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
     "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name"], "moreFields": ["website"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
@@ -1135,10 +1135,10 @@
     "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
     "waterway/lock_gate": {"icon": "maki-dam", "geometry": ["vertex", "line"], "fields": ["name", "ref", "height", "material"], "tags": {"waterway": "lock_gate"}, "addTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "removeTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "terms": ["canal"], "name": "Lock Gate"},
     "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
-    "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
+    "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "fishing", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
     "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "water_point"], "moreFields": ["opening_hours", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
     "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["{waterway/stream}"], "moreFields": ["{waterway/stream}"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"},
-    "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
+    "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
     "waterway/water_point": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "name": "Marine Drinking Water"},
     "waterway/waterfall": {"icon": "maki-waterfall", "fields": ["name", "height", "width", "intermittent"], "geometry": ["vertex"], "terms": ["fall"], "tags": {"waterway": "waterfall"}, "name": "Waterfall"},
     "waterway/weir": {"icon": "maki-dam", "geometry": ["vertex", "line"], "tags": {"waterway": "weir"}, "name": "Weir"},
diff --git a/data/presets/presets/leisure/fishing.json b/data/presets/presets/leisure/fishing.json
index 2645f57d9..2a1593e26 100644
--- a/data/presets/presets/leisure/fishing.json
+++ b/data/presets/presets/leisure/fishing.json
@@ -2,7 +2,8 @@
     "icon": "fas-fish",
     "fields": [
         "name",
-        "access_simple"
+        "access_simple",
+        "fishing"
     ],
     "geometry": [
         "vertex",
diff --git a/data/presets/presets/natural/water.json b/data/presets/presets/natural/water.json
index da006e501..2bfe630fc 100644
--- a/data/presets/presets/natural/water.json
+++ b/data/presets/presets/natural/water.json
@@ -6,6 +6,7 @@
         "intermittent"
     ],
     "moreFields": [
+        "fishing",
         "salt",
         "tidal"
     ],
diff --git a/data/presets/presets/shop/outdoor.json b/data/presets/presets/shop/outdoor.json
index 3e59f24df..c8551ace0 100644
--- a/data/presets/presets/shop/outdoor.json
+++ b/data/presets/presets/shop/outdoor.json
@@ -1,5 +1,9 @@
 {
     "icon": "temaki-compass",
+    "fields": [
+        "{shop}",
+        "clothes"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json
index 451582f76..e10ca2dd7 100644
--- a/data/presets/presets/waterway/canal.json
+++ b/data/presets/presets/waterway/canal.json
@@ -7,6 +7,7 @@
         "lock"
     ],
     "moreFields": [
+        "fishing",
         "salt",
         "tidal"
     ],
diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json
index 7ff4d72ee..802d85ab1 100644
--- a/data/presets/presets/waterway/river.json
+++ b/data/presets/presets/waterway/river.json
@@ -9,6 +9,7 @@
     ],
     "moreFields": [
         "covered",
+        "fishing",
         "salt"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
index 04f29f101..840b966dd 100644
--- a/data/presets/presets/waterway/stream.json
+++ b/data/presets/presets/waterway/stream.json
@@ -8,6 +8,7 @@
     ],
     "moreFields": [
         "covered",
+        "fishing",
         "salt",
         "tidal"
     ],
diff --git a/data/taginfo.json b/data/taginfo.json
index 4744d165a..fb7aa2194 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1311,6 +1311,7 @@
     {"key": "fire_hydrant:type", "value": "wall", "description": "🄵 Shape"},
     {"key": "fire_hydrant:type", "value": "pipe", "description": "🄵 Shape"},
     {"key": "fireplace", "description": "🄵 Fireplace"},
+    {"key": "fishing", "description": "🄵 Fishing"},
     {"key": "fitness_station", "description": "🄵 Equipment Type"},
     {"key": "fixme", "description": "🄵 Fix Me"},
     {"key": "flag:type", "description": "🄵 Flag Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 02a733ea1..d1e0151f1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2789,6 +2789,9 @@
                 "fireplace": {
                     "label": "Fireplace"
                 },
+                "fishing": {
+                    "label": "Fishing"
+                },
                 "fitness_station": {
                     "label": "Equipment Type"
                 },