diff --git a/data/presets.yaml b/data/presets.yaml
index c975f7959..3ac8a211a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1148,7 +1148,7 @@ en:
         label: Telephone
         # phone field placeholder
         placeholder: +31 42 123 4567
-      piste/difficulty:
+      piste_downhill/difficulty:
         # 'piste:difficulty=*'
         label: Difficulty
         options:
@@ -1166,9 +1166,119 @@ en:
           intermediate: Intermediate (blue square)
           # 'piste:difficulty=novice'
           novice: Novice (instructional)
-        # piste/difficulty field placeholder
+        # piste_downhill/difficulty field placeholder
         placeholder: 'Easy, Intermediate, Advanced...'
-      piste/grooming:
+      piste_downhill/grooming:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: Backcountry - no grooming
+          # 'piste:grooming=classic'
+          classic: Classic
+          # 'piste:grooming=mogul'
+          mogul: Mogul
+      piste_downhill/type:
+        # 'piste:type=*'
+        label: Type
+        options:
+          # 'piste:type=connection'
+          connection: Connection between pistes
+          # 'piste:type=downhill'
+          downhill: Downhill
+          # 'piste:type=playground'
+          playground: Playground
+          # 'piste:type=snow_park'
+          snow_park: Snow Park
+      piste_hike/difficulty:
+        # 'piste:difficulty=*'
+        label: Difficulty
+        options:
+          # 'piste:difficulty=advanced'
+          advanced: Advanced
+          # 'piste:difficulty=easy'
+          easy: Easy
+          # 'piste:difficulty=expert'
+          expert: Expert
+          # 'piste:difficulty=extreme'
+          extreme: Extreme
+          # 'piste:difficulty=freeride'
+          freeride: Freeride
+          # 'piste:difficulty=intermediate'
+          intermediate: Intermediate
+          # 'piste:difficulty=novice'
+          novice: Novice
+        # piste_hike/difficulty field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste_hike/grooming:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: Backcountry - Snowshoeing
+          # 'piste:grooming=classic'
+          classic: Classic - Winter Hiking
+      piste_nordic/difficulty:
+        # 'piste:difficulty=*'
+        label: Difficulty
+        options:
+          # 'piste:difficulty=advanced'
+          advanced: 'Advanced - Narrow, steep or icy section, sharp turn'
+          # 'piste:difficulty=easy'
+          easy: 'Easy - Soft hills, short steep section'
+          # 'piste:difficulty=expert'
+          expert: Expert - Dangerous terrain around
+          # 'piste:difficulty=intermediate'
+          intermediate: Intermediate - Steep section
+          # 'piste:difficulty=novice'
+          novice: 'Novice - Flat, no effort needed'
+        # piste_nordic/difficulty field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste_nordic/grooming:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: 'Backcountry, no grooming'
+          # 'piste:grooming=classic'
+          classic: Classic
+          # 'piste:grooming=classic+skating'
+          classic+skating: Classic and Skating
+          # 'piste:grooming=scooter'
+          scooter: Scooter/Snowmobile
+          # 'piste:grooming=skating'
+          skating: Skating
+      piste_nordic/type:
+        # 'piste:type=*'
+        label: Type
+        options:
+          # 'piste:type=connection'
+          connection: Connection between pistes
+          # 'piste:type=downhill'
+          downhill: Nordic
+          # 'piste:type=playground'
+          playground: Playground
+      piste_skitour/difficulty:
+        # 'piste:difficulty=*'
+        label: Difficulty
+        options:
+          # 'piste:difficulty=advanced'
+          advanced: 'Advanced - S: inclination 40-45 degree'
+          # 'piste:difficulty=easy'
+          easy: 'Easy - WS: inclination 30-35 degree'
+          # 'piste:difficulty=expert'
+          expert: 'Expert - SS: inclination 45–50 degree'
+          # 'piste:difficulty=extreme'
+          extreme: 'Extreme - EX: inclination >55 degree'
+          # 'piste:difficulty=freeride'
+          freeride: 'Freeride - AS: inclination 50–55 degree'
+          # 'piste:difficulty=intermediate'
+          intermediate: 'Intermediate - ZS: inclination 35-40 degree'
+          # 'piste:difficulty=novice'
+          novice: 'novice - L: inclination <30 degree'
+        # piste_skitour/difficulty field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste_skitour/grooming:
         # 'piste:grooming=*'
         label: Grooming
         options:
@@ -1176,38 +1286,64 @@ en:
           backcountry: Backcountry
           # 'piste:grooming=classic'
           classic: Classic
-          # 'piste:grooming=classic+skating'
-          classic+skating: Classic and Skating
           # 'piste:grooming=mogul'
           mogul: Mogul
-          # 'piste:grooming=scooter'
-          scooter: Scooter/Snowmobile
-          # 'piste:grooming=skating'
-          skating: Skating
-      piste/type:
-        # 'piste:type=*'
-        label: Type
+      piste_sled/difficulty:
+        # 'piste:difficulty=*'
+        label: Difficulty
         options:
-          # 'piste:type=connection'
-          connection: Connection
-          # 'piste:type=downhill'
-          downhill: Downhill
-          # 'piste:type=hike'
-          hike: Hike
-          # 'piste:type=ice_skate'
-          ice_skate: Ice Skate
-          # 'piste:type=nordic'
-          nordic: Nordic
-          # 'piste:type=playground'
-          playground: Playground
-          # 'piste:type=skitour'
-          skitour: Skitour
-          # 'piste:type=sled'
-          sled: Sled
-          # 'piste:type=sleigh'
-          sleigh: Sleigh
-          # 'piste:type=snow_park'
-          snow_park: Snow Park
+          # 'piste:difficulty=advanced'
+          advanced: Advanced
+          # 'piste:difficulty=easy'
+          easy: Easy
+          # 'piste:difficulty=expert'
+          expert: Expert
+          # 'piste:difficulty=extreme'
+          extreme: Extreme
+          # 'piste:difficulty=freeride'
+          freeride: Freeride
+          # 'piste:difficulty=intermediate'
+          intermediate: Intermediate
+          # 'piste:difficulty=novice'
+          novice: Novice
+        # piste_sled/difficulty field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste_sled/grooming:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: Backcountry - no grooming
+          # 'piste:grooming=classic'
+          classic: Classic - prepared
+      piste_sleigh/difficulty:
+        # 'piste:difficulty=*'
+        label: Difficulty
+        options:
+          # 'piste:difficulty=advanced'
+          advanced: Advanced
+          # 'piste:difficulty=easy'
+          easy: Easy
+          # 'piste:difficulty=expert'
+          expert: Expert
+          # 'piste:difficulty=extreme'
+          extreme: Extreme
+          # 'piste:difficulty=freeride'
+          freeride: Freeride
+          # 'piste:difficulty=intermediate'
+          intermediate: Intermediate
+          # 'piste:difficulty=novice'
+          novice: Novice
+        # piste_sleigh/difficulty field placeholder
+        placeholder: 'Easy, Intermediate, Advanced...'
+      piste_sleigh/grooming:
+        # 'piste:grooming=*'
+        label: Grooming
+        options:
+          # 'piste:grooming=backcountry'
+          backcountry: Backcountry - no grooming
+          # 'piste:grooming=classic'
+          classic: Classic - prepared
       place:
         # place=*
         label: Type
@@ -4887,11 +5023,41 @@ en:
         name: Water Utility Office
         # 'terms: water board,utility'
         terms: '<translate with synonyms or related terms for ''Water Utility Office'', separated by commas>'
-      piste:
-        # 'piste:type=*'
-        name: Piste/Ski Trail
-        # 'terms: ski,sled,sleigh,snowboard,nordic,downhill,snowmobile'
-        terms: '<translate with synonyms or related terms for ''Piste/Ski Trail'', separated by commas>'
+      piste/piste_downhill:
+        # 'piste:type=downhill'
+        name: Downhill Piste/Ski Run
+        # 'terms: ski,alpine,snowboard,downhill,piste'
+        terms: '<translate with synonyms or related terms for ''Downhill Piste/Ski Run'', separated by commas>'
+      piste/piste_hike:
+        # 'piste:type=hike'
+        name: Snowshoeing or Winter Hiking Trail
+        # 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski'
+        terms: '<translate with synonyms or related terms for ''Snowshoeing or Winter Hiking Trail'', separated by commas>'
+      piste/piste_ice_skate:
+        # 'piste:type=ice_skate'
+        name: Ice Skating Piste
+        # 'terms: ice,skating,ski,piste'
+        terms: '<translate with synonyms or related terms for ''Ice Skating Piste'', separated by commas>'
+      piste/piste_nordic:
+        # 'piste:type=nordic'
+        name: Nordic or Crosscountry Piste/Ski Trail
+        # 'terms: ski,nordic,crosscountry,skating,piste'
+        terms: '<translate with synonyms or related terms for ''Nordic or Crosscountry Piste/Ski Trail'', separated by commas>'
+      piste/piste_skitour:
+        # 'piste:type=skitour'
+        name: Ski Touring Trail
+        # 'terms: ski,skitour,crosscountry,ski touring,piste'
+        terms: '<translate with synonyms or related terms for ''Ski Touring Trail'', separated by commas>'
+      piste/piste_sled:
+        # 'piste:type=sled'
+        name: Sled Piste
+        # 'terms: ski,sled,luge,sleigh,sledge,piste'
+        terms: '<translate with synonyms or related terms for ''Sled Piste'', separated by commas>'
+      piste/piste_sleigh:
+        # 'piste:type=sleigh'
+        name: Animal-pulled Sleigh Piste
+        # 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse'
+        terms: '<translate with synonyms or related terms for ''Animal-pulled Sleigh Piste'', separated by commas>'
       place:
         # place=*
         name: Place
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b0ec1b069..d64368007 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -201,9 +201,20 @@
     "payment_multi": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "universal": true},
     "phases": {"key": "phases", "type": "number", "minValue": 1, "label": "Phases", "placeholder": "1, 2, 3..."},
     "phone": {"key": "phone", "type": "tel", "icon": "maki-telephone", "universal": true, "label": "Telephone", "placeholder": "+31 42 123 4567"},
-    "piste/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
-    "piste/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
-    "piste/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "nordic": "Nordic", "skitour": "Skitour", "sled": "Sled", "hike": "Hike", "sleigh": "Sleigh", "ice_skate": "Ice Skate", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection"}}},
+    "piste_downhill/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice (instructional)", "easy": "Easy (green circle)", "intermediate": "Intermediate (blue square)", "advanced": "Advanced (black diamond)", "expert": "Expert (double black diamond)", "freeride": "Freeride (off-piste)", "extreme": "Extreme (climbing equipment required)"}}},
+    "piste_downhill/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry - no grooming"}}},
+    "piste_downhill/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Downhill", "snow_park": "Snow Park", "playground": "Playground", "connection": "Connection between pistes"}}},
+    "piste_hike/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice", "easy": "Easy", "intermediate": "Intermediate", "advanced": "Advanced", "expert": "Expert", "freeride": "Freeride", "extreme": "Extreme"}}},
+    "piste_hike/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - Winter Hiking", "backcountry": "Backcountry - Snowshoeing"}}},
+    "piste_nordic/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice - Flat, no effort needed", "easy": "Easy - Soft hills, short steep section", "intermediate": "Intermediate - Steep section", "advanced": "Advanced - Narrow, steep or icy section, sharp turn", "expert": "Expert - Dangerous terrain around"}}},
+    "piste_nordic/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "backcountry": "Backcountry, no grooming", "classic+skating": "Classic and Skating", "scooter": "Scooter/Snowmobile", "skating": "Skating"}}},
+    "piste_nordic/type": {"key": "piste:type", "type": "typeCombo", "label": "Type", "strings": {"options": {"downhill": "Nordic", "playground": "Playground", "connection": "Connection between pistes"}}},
+    "piste_skitour/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "novice - L: inclination <30 degree", "easy": "Easy - WS: inclination 30-35 degree", "intermediate": "Intermediate - ZS: inclination 35-40 degree", "advanced": "Advanced - S: inclination 40-45 degree", "expert": "Expert - SS: inclination 45–50 degree", "freeride": "Freeride - AS: inclination 50–55 degree", "extreme": "Extreme - EX: inclination >55 degree"}}},
+    "piste_skitour/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic", "mogul": "Mogul", "backcountry": "Backcountry"}}},
+    "piste_sled/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice", "easy": "Easy", "intermediate": "Intermediate", "advanced": "Advanced", "expert": "Expert", "freeride": "Freeride", "extreme": "Extreme"}}},
+    "piste_sled/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - prepared", "backcountry": "Backcountry - no grooming"}}},
+    "piste_sleigh/difficulty": {"key": "piste:difficulty", "type": "combo", "label": "Difficulty", "placeholder": "Easy, Intermediate, Advanced...", "strings": {"options": {"novice": "Novice", "easy": "Easy", "intermediate": "Intermediate", "advanced": "Advanced", "expert": "Expert", "freeride": "Freeride", "extreme": "Extreme"}}},
+    "piste_sleigh/grooming": {"key": "piste:grooming", "type": "combo", "label": "Grooming", "strings": {"options": {"classic": "Classic - prepared", "backcountry": "Backcountry - no grooming"}}},
     "place": {"key": "place", "type": "typeCombo", "label": "Type"},
     "plant": {"key": "plant", "type": "combo", "label": "Plant"},
     "plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."},
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4d1f7eb42..85be7bedc 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -659,7 +659,13 @@
     "office/telecommunication": {"icon": "maki-telephone", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet", "phone", "voice"], "name": "Telecom Office"},
     "office/therapist": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"},
     "office/water_utility": {"icon": "maki-suitcase", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["water board", "utility"], "name": "Water Utility Office"},
-    "piste": {"icon": "maki-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "sled", "sleigh", "snowboard", "nordic", "downhill", "snowmobile"], "tags": {"piste:type": "*"}, "name": "Piste/Ski Trail"},
+    "piste/piste_downhill": {"icon": "maki-skiing", "fields": ["name", "piste_downhill/type", "piste_downhill/difficulty", "piste_downhill/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
+    "piste/piste_hike": {"icon": "fas-snowflake", "fields": ["name", "piste_hike/difficulty", "piste_hike/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
+    "piste/piste_ice_skate": {"icon": "fas-snowflake", "fields": ["name", "sport_ice", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
+    "piste/piste_nordic": {"icon": "maki-skiing", "fields": ["name", "piste_nordic/type", "piste_nordic/difficulty", "piste_nordic/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
+    "piste/piste_skitour": {"icon": "maki-skiing", "fields": ["name", "piste_skitour/difficulty", "piste_skitour/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
+    "piste/piste_sled": {"icon": "fas-snowflake", "fields": ["name", "piste_sled/difficulty", "piste_sled/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
+    "piste/piste_sleigh": {"icon": "fas-snowflake", "fields": ["name", "piste_sled/difficulty", "piste_sled/grooming", "oneway", "lit"], "geometry": ["point", "line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Animal-pulled Sleigh Piste"},
     "place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
     "place/city": {"icon": "maki-city", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
     "place/hamlet": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "geometry": ["point", "area"], "tags": {"place": "hamlet"}, "name": "Hamlet"},
diff --git a/data/taginfo.json b/data/taginfo.json
index 244690dee..67041056a 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -4414,10 +4414,53 @@
     },
     {
       "key": "piste:type",
-      "description": "Piste/Ski Trail",
+      "value": "downhill",
+      "description": "Downhill Piste/Ski Run, Type",
       "object_types": ["node", "way", "area"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
     },
+    {
+      "key": "piste:type",
+      "value": "hike",
+      "description": "Snowshoeing or Winter Hiking Trail",
+      "object_types": ["node", "way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "ice_skate",
+      "description": "Ice Skating Piste",
+      "object_types": ["node", "way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "nordic",
+      "description": "Nordic or Crosscountry Piste/Ski Trail",
+      "object_types": ["node", "way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "skitour",
+      "description": "Ski Touring Trail",
+      "object_types": ["node", "way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/skiing-15.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "sled",
+      "description": "Sled Piste",
+      "object_types": ["node", "way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
+    {
+      "key": "piste:type",
+      "value": "sleigh",
+      "description": "Animal-pulled Sleigh Piste",
+      "object_types": ["node", "way", "area"],
+      "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-snowflake.svg?sanitize=true"
+    },
     {
       "key": "place",
       "value": "farm",
@@ -7085,6 +7128,9 @@
       "value": "backcountry",
       "description": "Grooming"
     },
+    {"key": "piste:type", "value": "snow_park", "description": "Type"},
+    {"key": "piste:type", "value": "playground", "description": "Type"},
+    {"key": "piste:type", "value": "connection", "description": "Type"},
     {
       "key": "piste:grooming",
       "value": "classic+skating",
@@ -7092,16 +7138,6 @@
     },
     {"key": "piste:grooming", "value": "scooter", "description": "Grooming"},
     {"key": "piste:grooming", "value": "skating", "description": "Grooming"},
-    {"key": "piste:type", "value": "downhill", "description": "Type"},
-    {"key": "piste:type", "value": "nordic", "description": "Type"},
-    {"key": "piste:type", "value": "skitour", "description": "Type"},
-    {"key": "piste:type", "value": "sled", "description": "Type"},
-    {"key": "piste:type", "value": "hike", "description": "Type"},
-    {"key": "piste:type", "value": "sleigh", "description": "Type"},
-    {"key": "piste:type", "value": "ice_skate", "description": "Type"},
-    {"key": "piste:type", "value": "snow_park", "description": "Type"},
-    {"key": "piste:type", "value": "playground", "description": "Type"},
-    {"key": "piste:type", "value": "connection", "description": "Type"},
     {"key": "plant", "description": "Plant"},
     {"key": "plant:output:electricity", "description": "Power Output"},
     {"key": "baby", "description": "Baby Seat"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index cac517781..2c1fd036b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2427,7 +2427,7 @@
                     "label": "Telephone",
                     "placeholder": "+31 42 123 4567"
                 },
-                "piste/difficulty": {
+                "piste_downhill/difficulty": {
                     "label": "Difficulty",
                     "placeholder": "Easy, Intermediate, Advanced...",
                     "options": {
@@ -2440,30 +2440,131 @@
                         "extreme": "Extreme (climbing equipment required)"
                     }
                 },
-                "piste/grooming": {
+                "piste_downhill/grooming": {
                     "label": "Grooming",
                     "options": {
                         "classic": "Classic",
                         "mogul": "Mogul",
-                        "backcountry": "Backcountry",
+                        "backcountry": "Backcountry - no grooming"
+                    }
+                },
+                "piste_downhill/type": {
+                    "label": "Type",
+                    "options": {
+                        "downhill": "Downhill",
+                        "snow_park": "Snow Park",
+                        "playground": "Playground",
+                        "connection": "Connection between pistes"
+                    }
+                },
+                "piste_hike/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice",
+                        "easy": "Easy",
+                        "intermediate": "Intermediate",
+                        "advanced": "Advanced",
+                        "expert": "Expert",
+                        "freeride": "Freeride",
+                        "extreme": "Extreme"
+                    }
+                },
+                "piste_hike/grooming": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic - Winter Hiking",
+                        "backcountry": "Backcountry - Snowshoeing"
+                    }
+                },
+                "piste_nordic/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice - Flat, no effort needed",
+                        "easy": "Easy - Soft hills, short steep section",
+                        "intermediate": "Intermediate - Steep section",
+                        "advanced": "Advanced - Narrow, steep or icy section, sharp turn",
+                        "expert": "Expert - Dangerous terrain around"
+                    }
+                },
+                "piste_nordic/grooming": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "backcountry": "Backcountry, no grooming",
                         "classic+skating": "Classic and Skating",
                         "scooter": "Scooter/Snowmobile",
                         "skating": "Skating"
                     }
                 },
-                "piste/type": {
+                "piste_nordic/type": {
                     "label": "Type",
                     "options": {
-                        "downhill": "Downhill",
-                        "nordic": "Nordic",
-                        "skitour": "Skitour",
-                        "sled": "Sled",
-                        "hike": "Hike",
-                        "sleigh": "Sleigh",
-                        "ice_skate": "Ice Skate",
-                        "snow_park": "Snow Park",
+                        "downhill": "Nordic",
                         "playground": "Playground",
-                        "connection": "Connection"
+                        "connection": "Connection between pistes"
+                    }
+                },
+                "piste_skitour/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "novice - L: inclination <30 degree",
+                        "easy": "Easy - WS: inclination 30-35 degree",
+                        "intermediate": "Intermediate - ZS: inclination 35-40 degree",
+                        "advanced": "Advanced - S: inclination 40-45 degree",
+                        "expert": "Expert - SS: inclination 45–50 degree",
+                        "freeride": "Freeride - AS: inclination 50–55 degree",
+                        "extreme": "Extreme - EX: inclination >55 degree"
+                    }
+                },
+                "piste_skitour/grooming": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "mogul": "Mogul",
+                        "backcountry": "Backcountry"
+                    }
+                },
+                "piste_sled/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice",
+                        "easy": "Easy",
+                        "intermediate": "Intermediate",
+                        "advanced": "Advanced",
+                        "expert": "Expert",
+                        "freeride": "Freeride",
+                        "extreme": "Extreme"
+                    }
+                },
+                "piste_sled/grooming": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic - prepared",
+                        "backcountry": "Backcountry - no grooming"
+                    }
+                },
+                "piste_sleigh/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice",
+                        "easy": "Easy",
+                        "intermediate": "Intermediate",
+                        "advanced": "Advanced",
+                        "expert": "Expert",
+                        "freeride": "Freeride",
+                        "extreme": "Extreme"
+                    }
+                },
+                "piste_sleigh/grooming": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic - prepared",
+                        "backcountry": "Backcountry - no grooming"
                     }
                 },
                 "place": {
@@ -5714,9 +5815,33 @@
                     "name": "Water Utility Office",
                     "terms": "water board,utility"
                 },
-                "piste": {
-                    "name": "Piste/Ski Trail",
-                    "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+                "piste/piste_downhill": {
+                    "name": "Downhill Piste/Ski Run",
+                    "terms": "ski,alpine,snowboard,downhill,piste"
+                },
+                "piste/piste_hike": {
+                    "name": "Snowshoeing or Winter Hiking Trail",
+                    "terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski"
+                },
+                "piste/piste_ice_skate": {
+                    "name": "Ice Skating Piste",
+                    "terms": "ice,skating,ski,piste"
+                },
+                "piste/piste_nordic": {
+                    "name": "Nordic or Crosscountry Piste/Ski Trail",
+                    "terms": "ski,nordic,crosscountry,skating,piste"
+                },
+                "piste/piste_skitour": {
+                    "name": "Ski Touring Trail",
+                    "terms": "ski,skitour,crosscountry,ski touring,piste"
+                },
+                "piste/piste_sled": {
+                    "name": "Sled Piste",
+                    "terms": "ski,sled,luge,sleigh,sledge,piste"
+                },
+                "piste/piste_sleigh": {
+                    "name": "Animal-pulled Sleigh Piste",
+                    "terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse"
                 },
                 "place/farm": {
                     "name": "Farm",