diff --git a/paddling_amenities.yaml b/paddling_amenities.yaml
index 60d17be..5581cc4 100644
--- a/paddling_amenities.yaml
+++ b/paddling_amenities.yaml
@@ -44,39 +44,48 @@ feature:
   body: |-
     {% if constIndex in ['canoe=put_in', 'leisure=slipway','canoe=portage'] %}
       <ul>
+        {% if attribute(tags, 'surface') %}
         <li class='hasSymbol'>
           <i class='fa fa-window-minimize'></i>
           {{ keyTrans('Surface') }}:
           <span class='value'>{{ attribute(tags, 'surface') ? tagTrans('surface', attribute(tags, 'surface')) : '' }}</span>
         </li>
+        {% endif %}
 
+
+        {% if attribute(tags, 'operator') %}
         <li class='hasSymbol'>
           <i class='fa fa-drivers-license-o'></i>
           {{ keyTrans('Operator') }}:
           <span class='value'>{{ attribute(tags, 'operator') ? tagTrans('operator', attribute(tags, 'operator')) : '' }}</span>
         </li>
+        {% endif %}
 
+        {% if attribute(tags, 'access') %}
         <li class='hasSymbol'>
           <i class='fa fa-unlock'></i>
           {{ keyTrans('Access') }}:
           <span class='value'>{{ attribute(tags, 'access') ? tagTrans('access', attribute(tags, 'access')) : '' }}</span>
         </li>
+        {% endif %}
 
+        {% if attribute(tags, 'fee') %}
         <li class='hasSymbol'>
           <i class='fa fa-money'></i>
           {{ keyTrans('Fee') }}:
           <span class='value'>{{ attribute(tags, 'fee') ? tagTrans('fee', attribute(tags, 'fee')) : '' }}</span>
         </li>
+        {% endif %}
 
+        {% if attribute(tags, 'mapillary') %}
         <li class='hasSymbol'>
           <i class='fa fa-camera'></i>
           {{ trans('Photos') }}:
           <span class='value'>
-          {% if attribute(tags, 'mapillary') %}
             <a href="https://www.mapillary.com/app/?focus=photo&pKey={{ attribute(tags, 'mapillary') }}" rel="noreferrer" target="_blank">Mapillary</a>
-          {% endif %}
           </span>
         </li>
+        {% endif %}
 
       </ul>
     {% endif %}
diff --git a/paddling_hazards.yaml b/paddling_hazards.yaml
index a19eb5c..5572f9e 100644
--- a/paddling_hazards.yaml
+++ b/paddling_hazards.yaml
@@ -61,15 +61,15 @@ feature:
       </li>
       {% endif %}
 
+      {% if attribute(tags, 'mapillary') %}
       <li class='hasSymbol'>
         <i class='fa fa-camera'></i>
         {{ trans('Photos') }}:
         <span class='value'>
-        {% if attribute(tags, 'mapillary') %}
           <a href="https://www.mapillary.com/app/?focus=photo&pKey={{ attribute(tags, 'mapillary') }}" rel="noreferrer" target="_blank">Mapillary</a>
-        {% endif %}
         </span>
       </li>
+      {% endif %}
 
     </ul>
   markerSign: <i class="fas fa-exclamation-triangle"></i>