diff --git a/client/freemap_slovakia/amenities.xslt b/client/freemap_slovakia/amenities.xslt
index 4b0262c..d435788 100644
--- a/client/freemap_slovakia/amenities.xslt
+++ b/client/freemap_slovakia/amenities.xslt
@@ -4,9 +4,11 @@
 
     <xsl:template name="amenity_ways">
         <rule e="way" k="amenity" v="*">
-            <rule e="way" k="amenity" v="kindergarten|school|college|university">
+            <rule e="way" k="amenity" v="kindergarten|school|college|university" zoom-min="15">
                 <area fill="#DFAFDD" stroke="#e9dd72" stroke-width="0.2dp"/>
-                <caption k="name" font-style="normal" font-size="9dp" fill="#000000" stroke="#ffffff" stroke-width="2.0dp"/>
+                <rule e="way" k="*" v="*" zoom-min="17">
+                   <caption k="name" font-style="normal" font-size="9dp" fill="#000000" stroke="#ffffff" stroke-width="2.0dp"/>
+                </rule>
             </rule>
             <rule e="way" k="amenity" v="grave_yard">
                 <area src="file:/patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2dp"/>
@@ -20,10 +22,11 @@
                     <symbol src="file:/symbols/parking.svg" symbol-width="12dp"/>
                 </rule>
             </rule>
-            <rule e="way" k="amenity" v="fountain" closed="yes">
+            <rule e="way" k="amenity" v="fountain" closed="yes" zoom-min="16">
                 <area fill="#b5d6f1" stroke="#000080" stroke-width="0.15dp"/>
                 <rule e="way" k="*" v="*" zoom-min="17">
                     <symbol src="file:/symbols/fountain.png" symbol-width="12dp"/>
+                    <caption k="name" dy="18dp" font-style="bold_italic" font-size="8dp" fill="#4040ff" stroke="#ffffff" stroke-width="2dp"/>
                 </rule>
             </rule>
             <rule e="way" k="amenity" v="hospital" zoom-min="15">
@@ -93,6 +96,7 @@
             </rule>
             <rule e="node" k="amenity" v="fountain" zoom-min="17">
                 <symbol src="file:/symbols/fountain.png" symbol-width="12dp"/>
+                <caption k="name" dy="18dp" font-style="bold_italic" font-size="8dp" fill="#4040ff" stroke="#ffffff" stroke-width="2dp"/>
             </rule>
             <rule e="node" k="amenity" v="fuel" zoom-min="17">
                 <symbol src="file:/symbols/petrolStation.png" symbol-width="12dp"/>
diff --git a/client/freemap_slovakia/freemap_slovakia.xslt b/client/freemap_slovakia/freemap_slovakia.xslt
index 74b0284..44dd187 100644
--- a/client/freemap_slovakia/freemap_slovakia.xslt
+++ b/client/freemap_slovakia/freemap_slovakia.xslt
@@ -48,6 +48,9 @@
                 </rule>
                 <rule e="any" k="military" v="bunker" zoom-min="14">
                     <symbol src="file:/symbols/bunker.svg" symbol-width="12dp"/>
+                    <rule e="any" k="*" v="*" zoom-min="17">
+                       <caption k="name" dy="18dp" font-style="bold_italic" font-size="8dp" fill="#000000" stroke="#ffffff" stroke-width="2dp"/>
+                    </rule>
                 </rule>
 
                 <!-- historic -->
@@ -83,9 +86,11 @@
                 <xsl:call-template name="tourism_areas"/>
 
                 <rule e="way" k="natural" v="water">
-                    <area fill="#8DB0DD"/>
-                    <rule e="way" k="*" v="*" zoom-min="13">
-                        <caption k="name" font-style="bold_italic" font-size="8dp" fill="#4040ff" stroke="#ffffff" stroke-width="2dp"/>
+                   <rule e="way" k="waterway|amenity" v="~">
+                       <area fill="#8DB0DD"/>
+                       <rule e="way" k="*" v="*" zoom-min="13">
+                           <caption k="name" font-style="bold_italic" font-size="8dp" fill="#4040ff" stroke="#ffffff" stroke-width="2dp"/>
+                       </rule>
                     </rule>
                 </rule>
 
@@ -134,7 +139,7 @@
                 <xsl:call-template name="highways_no_tunnel"/>
 
                 <!-- building -->
-                <rule e="way" k="building" v="*" zoom-min="14">
+                <rule e="way" k="building" v="*" zoom-min="15">
                     <area fill="#CBCBCB" stroke="#8F8F8F" stroke-width="0.2dp"/>
                 </rule>
 
diff --git a/client/freemap_slovakia/tourism.xslt b/client/freemap_slovakia/tourism.xslt
index 1f98d54..07c0170 100644
--- a/client/freemap_slovakia/tourism.xslt
+++ b/client/freemap_slovakia/tourism.xslt
@@ -98,7 +98,7 @@
     </xsl:template>
 
     <xsl:template name="tourism_areas">
-        <rule e="way" k="tourism" v="*">
+        <rule e="way" k="tourism" v="*" zoom-min="15">
             <rule e="way" k="tourism" v="attraction">
                 <area fill="#F2CAEA"/>
                 <symbol src="file:/symbols/attraction.svg" symbol-width="18dp"/>