diff --git a/layers/mountain_peak/mountain_peak.yaml b/layers/mountain_peak/mountain_peak.yaml
index df917b26..1fa53a3e 100644
--- a/layers/mountain_peak/mountain_peak.yaml
+++ b/layers/mountain_peak/mountain_peak.yaml
@@ -8,7 +8,9 @@ layer:
     name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the peak.
     name_en: English name `name:en` if available, otherwise `name`.
     name_de: German name `name:de` if available, otherwise `name` or `name:en`.
-    elev_m: Elevation (`ele`) in meters.
+    ele: Elevation (`ele`) in meters.
+    ele_ft: Elevation (`ele`) in feets.
+    rank: Rank of the peak within one tile (starting at 1 that is the most important peak).
   datasource:
     geometry_field: geometry
     srid: 900913
diff --git a/layers/water_name/layer.sql b/layers/water_name/layer.sql
index a4ffca27..f84b107b 100644
--- a/layers/water_name/layer.sql
+++ b/layers/water_name/layer.sql
@@ -1,6 +1,6 @@
 
 -- etldoc: layer_water_name[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_water_name | <z9_13> z9_13 | <z14_> z14+" ] ;
+-- etldoc:     label="layer_water_name | <z0_8> z0_8 | <z9_13> z9_13 | <z14_> z14+" ] ;
 
 CREATE OR REPLACE FUNCTION layer_water_name(bbox geometry, zoom_level integer)
 RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de text, class text) AS $$
@@ -26,7 +26,9 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, name_de
         (zoom_level BETWEEN 9 AND 13 AND area > 70000*2^(20-zoom_level))
         OR (zoom_level >= 14)
     )
-    -- etldoc: osm_marine_point ->  layer_water_name:z0_14_
+    -- etldoc: osm_marine_point ->  layer_water_name:z0_8
+    -- etldoc: osm_marine_point ->  layer_water_name:z9_13
+    -- etldoc: osm_marine_point ->  layer_water_name:z14_
     UNION ALL
     SELECT osm_id, geometry, name,
     COALESCE(NULLIF(name_en, ''), name) AS name_en,