Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 7937)
+++ trunk/data/validator/geometry.mapcss	(revision 7942)
@@ -24,5 +24,5 @@
 node[natural=ridge],
 node[natural=tree_row] {
-  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}");
+  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");
   assertMatch: "node oneway=-1";
   assertNoMatch: "way oneway=-1";
@@ -55,4 +55,12 @@
 node[restriction] {
   throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
+}
+
+/* {0} on a way, should be a node */
+way[natural=peak],
+way[natural=saddle],
+way[natural=volcano],
+way[natural=tree] {
+  throwWarning: tr("{0} on a way. Should be used on a node.", "{0.tag}"); 
 }