diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml
index 2c3ef2a..4e61569 100644
--- a/paddling_amenities.yaml
+++ b/paddling_amenities.yaml
@@ -1,99 +1,75 @@
 type: overpass
 name:
-  en: Paddling Amenities
+  en: Paddling Hazards
 query:
-  '14': |-
+  '13': |-
     (
-      node["canoe"="put_in"];
-      node["leisure"="slipway"];
-      way["canoe"="portage"];
-      nwr[shop~"^(boat)$"]["boat:type"~"^(.*;|)canoe|kayak|standup_paddleboard|dinghy|pedalboat(|;.*)$"];
-      nwr[rental~"^(boat)$"]["boat:type"~"^(.*;|)canoe|kayak|standup_paddleboard|dinghy|pedalboat(|;.*)$"];
-      nwr["canoe_rental"="yes"];
-      nwr["kayak_rental"="yes"];
-      nwr["standup_paddleboard_rental"="yes"];
-      nwr["dinghy_rental"="yes"];
-      nwr["pedalboat_rental"="yes"];
+      nwr[waterway~"^(dam|weir|waterfall|rapids|lock|lock_gate|sluice_gate)$"];
     )
 feature:
   pre: |-
-    {% if tags.canoe %}
-      {% set key = 'canoe' %}
-      {% set value = tags.canoe %}
-    {% elseif tags.leisure %}
-      {% set key = 'leisure' %}
-      {% set value = tags.leisure %}
-    {% elseif tags.shop %}
-      {% set key = 'shop' %}
-      {% set value = tags.shop %}
-    {% elseif tags.rental or tags.canoe_rental or tags.kayak_rental or tags.standup_paddleboard_rental or tags.dingy_rental or tags.pedalboat_rental %}
-      {% set key = 'shop' %}
-      {% set value = 'rental' %}
+    {% if tags.waterway %}
+      {% set key = 'waterway' %}
+      {% set value = tags.waterway %}
     {% endif %}
 
     {% set constIndex = (key ~ "=" ~ value) %}
     {% set item = const[constIndex] %}
-
   title: |
-    {{ localizedTag(tags, 'name') }}
-    {% if attribute(tags, 'ref') %}
-      ( {{ localizedTag(tags, 'ref') }} )
-    {% endif %}
+    {{ item['sign'] }} {{ localizedTag(tags, 'name') | default(localizedTag(tags, 'key')) | default(localizedTag(tags, 'ref')) }}
   description: |
     {{ tagTrans(key, value) }}
   body: |-
-    {% if constIndex in ['canoe=put_in', 'leisure=slipway','canoe=portage'] %}
-      <dl>
-        <dt>{{ keyTrans('Description') }}</dt>
-        <dd>{{ localizedTag(tags, 'description') }}</dd>
-
-        <dt>{{ keyTrans('Surface') }}</dt>
-        <dd>{{ attribute(tags, 'surface') ? tagTrans('surface', attribute(tags, 'surface')) : '' }}</dd>
-
+    <dl>
+      <dt>{{ keyTrans('Description') }}</dt>
+      <dd>{{ localizedTag(tags, 'description') }}</dd>
+      
+      {% if attribute(tags, 'operator') %}
         <dt>{{ keyTrans('Operator') }}</dt>
         <dd>{{ attribute(tags, 'operator') ? tagTrans('operator', attribute(tags, 'operator')) : '' }}</dd>
+      {% endif %}
 
-        <dt>{{ keyTrans('Access') }}</dt>
-        <dd>{{ attribute(tags, 'access') ? tagTrans('access', attribute(tags, 'access')) : '' }}</dd>
-
-        <dt>{{ keyTrans('Fee') }}</dt>
-        <dd>{{ attribute(tags, 'fee') ? tagTrans('fee', attribute(tags, 'fee')) : '' }}</dd>
-
-        <dt>{{ keyTrans('Wheelchair') }}</dt>
-        <dd>{{ attribute(tags, 'wheelchair') ? tagTrans('wheelchair', attribute(tags, 'wheelchair')) : '' }}</dd>
-
-        <dt>{{ trans('Photos') }}</dt>
-        <dd>
-          <ul>
-            {% if attribute(tags, 'mapillary') %}
-              <li><a href="https://www.mapillary.com/app/?focus=photo&pKey={{ attribute(tags, 'mapillary') }}" rel="noreferrer" target="_blank">Mapillary</a></li>
-            {% endif %}
-          </ul>
-        </dd>
-      </dl>
-    {% endif %}   
-  markerSign: '{{ item[''sign''] }}'
+      <dt>{{ trans('Photos') }}</dt>
+      <dd>
+        <ul>
+          {% if attribute(tags, 'mapillary') %}
+            <li><a href="https://www.mapillary.com/app/?focus=photo&pKey={{ attribute(tags, 'mapillary') }}" rel="noreferrer" target="_blank">Mapillary</a></li>
+          {% endif %}
+        </ul>
+      </dd>
 
+    </dl>
+  markerSign: '⚠️'
+  markerSymbol: |
+      {{ markerPointer({ fillColor: '#FFFFFF' }) }}
+  listMarkerSymbol: |
+    {{ markerCircle({ fillColor: '#FFFFFF' }) }}
   priority: |-
-    {% if item is defined %}
-      {{ item['priority'] }}
+    {% if const[constIndex] is defined %}
+      {{ const[constIndex]['priority'] }}
     {% else %}
       10
     {% endif %}
-
 const:
-  canoe=put_in:
-    sign: 🛶
+  waterway=dam:
+    sign: '🦫'
+    priority: 0
+  waterway=weir:
+    sign: '🦫'
+    priority: 0
+  waterway=waterfall:
+    sign: '🌊'
+    priority: 0
+  waterway=rapids:
+    sign: '🌊'
     priority: 0
-  leisure=slipway:
-    sign: 🚣🏻
+  waterway=lock:
+    sign: '🚪'
     priority: 1
-  canoe=portage:
-    sign: 🚶🏻
-    priority: 2
-  shop=boat:
-    sign: 🛒
-    priority: 3
-  shop=rental:
-    sign: 🛒
-    priority: 3
\ No newline at end of file
+  waterway=lock_gate:
+    sign: '🚪'
+    priority: 1
+  waterway=sluice_gate:
+    sign: '🦫'
+    priority: 0
+
diff --git a/paddling_hazards.yaml b/paddling_hazards.yaml
index 2b21c73..4e61569 100644
--- a/paddling_hazards.yaml
+++ b/paddling_hazards.yaml
@@ -15,7 +15,6 @@ feature:
 
     {% set constIndex = (key ~ "=" ~ value) %}
     {% set item = const[constIndex] %}
-
   title: |
     {{ item['sign'] }} {{ localizedTag(tags, 'name') | default(localizedTag(tags, 'key')) | default(localizedTag(tags, 'ref')) }}
   description: |
@@ -40,16 +39,17 @@ feature:
       </dd>
 
     </dl>
-
   markerSign: '⚠️'
-
+  markerSymbol: |
+      {{ markerPointer({ fillColor: '#FFFFFF' }) }}
+  listMarkerSymbol: |
+    {{ markerCircle({ fillColor: '#FFFFFF' }) }}
   priority: |-
     {% if const[constIndex] is defined %}
       {{ const[constIndex]['priority'] }}
     {% else %}
       10
     {% endif %}
-
 const:
   waterway=dam:
     sign: '🦫'