diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml
index 36f55c2..a0e5da7 100644
--- a/paddling_amenities.yaml
+++ b/paddling_amenities.yaml
@@ -23,7 +23,7 @@ feature:
     {% endif %}
 
     {% set constIndex = (key ~ "=" ~ value) %}
-    {% set amenity = const[constIndex] %}
+    {% set item = const[constIndex] %}
 
   title: |
     {{ localizedTag(tags, 'name') | default(localizedTag(tags, 'operator')) | default(localizedTag(tags, 'ref')) }}
@@ -32,28 +32,28 @@ feature:
   body: |-
     {% if constIndex in ['canoe=put_in', 'leisure=slipway','canoe=portage'] %}
       <dl>
-        <dt>Surface</dt>
-        <dd>{% if attribute(tags, 'surface') %}{{ tagTrans('surface', tags.surface) }}{% endif %}</dd>
+        <dt>{{ keyTrans('surface') }}</dt>
+        <dd>{{ tagTrans('surface', attribute(tags, 'surface')) }</dd>
         
         <dt>{{ keyTrans('description') }}</dt>
-        <dd>{{ localizedTag(tags, 'description') }}</dd>
+        <dd>{{ localizedTag(tags, attribute(tags, 'description')) }}</dd>
 
         <dt>{{ keyTrans('access') }}</dt>
-        <dd>{{ tagTrans('access', tags.access) }}</dd>
+        <dd>{{ tagTrans('access', attribute(tags, 'access')) }}</dd>
 
         <dt>{{ keyTrans('fee') }}</dt>
-        <dd>{{ tagTrans('fee', tags.fee) }}</dd>
+        <dd>{{ tagTrans('fee', attribute(tags, 'fee')) }}</dd>
 
       </dl>
       {% if attribute(tags, 'mapillary') %}
         <div><a href="https://www.mapillary.com/app/?focus=photo&pKey={{ attribute(tags, 'mapillary') }}" rel="noreferrer" target="_blank">Mapillary Photo</a><div>
       {% endif %}
     {% endif %}
-  markerSign: '{{ const[constIndex][''sign''] }}'
+  markerSign: '{{ item[''sign''] }}'
 
   priority: |-
-    {% if const[constIndex] is defined %}
-      {{ const[constIndex]['priority'] }}
+    {% if item is defined %}
+      {{ item['priority'] }}
     {% else %}
       10
     {% endif %}