diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml
index 4e61569..021bc92 100644
--- a/paddling_amenities.yaml
+++ b/paddling_amenities.yaml
@@ -1,75 +1,106 @@
 type: overpass
 name:
-  en: Paddling Hazards
+  en: Paddling Amenities
 query:
-  '13': |-
+  '14': |-
     (
-      nwr[waterway~"^(dam|weir|waterfall|rapids|lock|lock_gate|sluice_gate)$"];
+      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"];
     )
 feature:
   pre: |-
-    {% if tags.waterway %}
+    {% if tags.canoe == 'portage' and ( not attribute(tags, 'surface') or attribute(tags, 'surface') == 'water' ) %}
       {% set key = 'waterway' %}
-      {% set value = tags.waterway %}
+      {% set value = 'portage' %}
+    {% elseif 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 = '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' %}
     {% endif %}
 
     {% set constIndex = (key ~ "=" ~ value) %}
     {% set item = const[constIndex] %}
   title: |
-    {{ item['sign'] }} {{ localizedTag(tags, 'name') | default(localizedTag(tags, 'key')) | default(localizedTag(tags, 'ref')) }}
+    {{ localizedTag(tags, 'name') }}
+    {% if attribute(tags, 'ref') %}
+      ( {{ localizedTag(tags, 'ref') }} )
+    {% endif %}
   description: |
     {{ tagTrans(key, value) }}
   body: |-
-    <dl>
-      <dt>{{ keyTrans('Description') }}</dt>
-      <dd>{{ localizedTag(tags, 'description') }}</dd>
-      
-      {% if attribute(tags, 'operator') %}
+    {% 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>
+
         <dt>{{ keyTrans('Operator') }}</dt>
         <dd>{{ attribute(tags, 'operator') ? tagTrans('operator', attribute(tags, 'operator')) : '' }}</dd>
-      {% endif %}
 
-      <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>
+        <dt>{{ keyTrans('Access') }}</dt>
+        <dd>{{ attribute(tags, 'access') ? tagTrans('access', attribute(tags, 'access')) : '' }}</dd>
 
-    </dl>
-  markerSign: '⚠️'
+        <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''] | raw }}'
   markerSymbol: |
-      {{ markerPointer({ fillColor: '#FFFFFF' }) }}
+    {% if item['sign'] %}{{ markerPointer({ fillColor: '#FFFFFF' }) }}{% endif %}
   listMarkerSymbol: |
-    {{ markerCircle({ fillColor: '#FFFFFF' }) }}
+    {% if item['sign'] %}{{ markerCircle({ fillColor: '#FFFFFF' }) }}{% endif %}
   priority: |-
-    {% if const[constIndex] is defined %}
-      {{ const[constIndex]['priority'] }}
+    {% if item is defined %}
+      {{ item['priority'] }}
     {% else %}
       10
     {% endif %}
 const:
-  waterway=dam:
-    sign: '🦫'
-    priority: 0
-  waterway=weir:
-    sign: '🦫'
+  canoe=portage:
+    sign: <i class="fas fa-walking"></i>
+    priority: 2
+  canoe=put_in:
+    sign: <i class="fas fa-expand-alt"></i>
     priority: 0
-  waterway=waterfall:
-    sign: '🌊'
-    priority: 0
-  waterway=rapids:
-    sign: '🌊'
-    priority: 0
-  waterway=lock:
-    sign: '🚪'
-    priority: 1
-  waterway=lock_gate:
-    sign: '🚪'
+  leisure=slipway:
+    sign: <i class="fas fa-ship"></i>
     priority: 1
-  waterway=sluice_gate:
-    sign: '🦫'
-    priority: 0
-
+  shop=shop:
+    sign: <i class="fas fa-store-alt"></i>
+    priority: 3
+  shop=rental:
+    sign: <i class="fas fa-store"></i>
+    priority: 3
+  waterway=portage:
+    sign:
+    priority: 2
\ No newline at end of file
diff --git a/paddling_hazards.yaml b/paddling_hazards.yaml
index 4e61569..821276c 100644
--- a/paddling_hazards.yaml
+++ b/paddling_hazards.yaml
@@ -16,7 +16,7 @@ feature:
     {% set constIndex = (key ~ "=" ~ value) %}
     {% set item = const[constIndex] %}
   title: |
-    {{ item['sign'] }} {{ localizedTag(tags, 'name') | default(localizedTag(tags, 'key')) | default(localizedTag(tags, 'ref')) }}
+    {{ item['sign'] | raw }} {{ localizedTag(tags, 'name') | default(localizedTag(tags, 'key')) | default(localizedTag(tags, 'ref')) }}
   description: |
     {{ tagTrans(key, value) }}
   body: |-
@@ -39,11 +39,11 @@ feature:
       </dd>
 
     </dl>
-  markerSign: '⚠️'
+  markerSign: <i class="fas fa-exclamation-triangle"></i>
   markerSymbol: |
-      {{ markerPointer({ fillColor: '#FFFFFF' }) }}
+      {{ markerPointer({ fillColor: '#ff6700' }) }}
   listMarkerSymbol: |
-    {{ markerCircle({ fillColor: '#FFFFFF' }) }}
+    {{ markerCircle({ fillColor: '#ff6700' }) }}
   priority: |-
     {% if const[constIndex] is defined %}
       {{ const[constIndex]['priority'] }}
@@ -52,24 +52,24 @@ feature:
     {% endif %}
 const:
   waterway=dam:
-    sign: '🦫'
+    sign: <i class="fas fa-sort-amount-down-alt"></i>
     priority: 0
   waterway=weir:
-    sign: '🦫'
+    sign: <i class="fas fa-sort-amount-up-alt"></i>
     priority: 0
   waterway=waterfall:
-    sign: '🌊'
+    sign: <i class="far fa-chart-bar"></i>
     priority: 0
   waterway=rapids:
-    sign: '🌊'
+    sign: <i class="fas fa-water"></i>
     priority: 0
   waterway=lock:
-    sign: '🚪'
+    sign: <i class="fas fa-lock"></i>
     priority: 1
   waterway=lock_gate:
-    sign: '🚪'
+    sign: <i class="fas fa-torii-gate"></i>
     priority: 1
   waterway=sluice_gate:
-    sign: '🦫'
+    sign: <i class="fas fa-grip-lines"></i>
     priority: 0