Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 13005)
+++ trunk/data/defaultpresets.xml	(revision 13006)
@@ -3105,5 +3105,4 @@
                     <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" />
                     <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" />
-                    <check key="fuel:adblue" text="Diesel Exhaust Fluid (AdBlue/AUS32)" />
                     <check key="fuel:octane_80" text="Octane 80" />
                     <check key="fuel:octane_91" text="Octane 91" />
@@ -3119,4 +3118,7 @@
                     <check key="fuel:1_50" text="1/50 mix (mofa/moped)" />
                 </checkgroup>
+                <space />
+                <label text="Additives:" />
+                <check key="fuel:adblue" text="Diesel Exhaust Fluid (AdBlue/AUS32)" />
                 <space />
                 <label text="Fuel cards:" />
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 13005)
+++ trunk/data/validator/geometry.mapcss	(revision 13006)
@@ -111,4 +111,22 @@
 way[route=bus] {
   throwError: tr("{0} on a way. Should be used in a relation", "{0.tag}"); 
+}
+
+/* #14395 */
+way >[index=1] node,
+way >[index=-1] node {
+  set first_last_node;
+}
+way[highway][area!=yes][!tunnel][!covered] > node {
+  set node_in_highway;
+}
+way[building][building!=no] > node.node_in_highway!.first_last_node {
+  throwWarning: tr("node connects highway and building");
+}
+
+/* #15035, must not warn for node 3815077900*/
+node[man_made!=monitoring_station][at(0.0,0.0)] {
+  throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
+  fixDeleteObject: this;
 }
 
@@ -247,5 +265,5 @@
 }
 
-/* #11128, #14812 */
+/* #11128, #14812, #15032 */
 way[highway] > node[tourism=information][information=guidepost] {
   set guidepost;
@@ -257,5 +275,6 @@
 way[highway] > node[office][!entrance],
 way[highway] > node[shop][!entrance],
-way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost {
+way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost.first_last_node:connection,
+way[highway] > node[tourism][!entrance][tourism!=viewpoint]!.guidepost!.first_last_node {
   throwWarning: tr("{0} node connected to a highway", "{0.key}");
 }
@@ -321,22 +340,4 @@
 }
 
-/* #14395 */
-way >[index=1] node,
-way >[index=-1] node {
-  set first_last_node;
-}
-way[highway][area!=yes][!tunnel][!covered] > node {
-  set node_in_highway;
-}
-way[building][building!=no] > node.node_in_highway!.first_last_node {
-  throwWarning: tr("node connects highway and building");
-}
-
-/* #15035, must not warn for node 3815077900*/
-node[man_made!=monitoring_station][at(0.0,0.0)] {
-  throwError: tr("Object at Position 0.00E 0.00N. There is nothing at this position except an already mapped weather buoy.");
-  fixDeleteObject: this;
-}
-
 /* #15097 */
 way[highway][area!=yes] > node,