Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 7243)
+++ trunk/data/validator/combinations.mapcss	(revision 7250)
@@ -112,5 +112,4 @@
 /* {0.key} without {1.key} or {2.tag} */
 *[segregated                   ][!highway][railway=crossing],
-*[toll                         ][!highway][route!~/^(ferry|road)$/],
 *[boat                         ][!waterway][natural!=water],
 *[intermittent                 ][!waterway][natural!=water] {
@@ -121,4 +120,9 @@
 *[snowplowing                  ][!highway][!amenity][!leisure] {
   throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.key}");
+}
+
+/* {0.key} without {1.key}, {2.key} or {3.tag} */
+*[toll                         ][!highway][!barrier][route!~/^(ferry|road)$/] {
+  throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.key}", "{3.tag}");
 }
 
@@ -153,5 +157,5 @@
 
 /* see ticket #9593 */
-*[sport][tourism != hotel][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool)$/][natural !~ /^(beach|bare_rock)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/] {
+*[sport][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool)$/][natural !~ /^(beach|bare_rock)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/] {
     throwWarning: tr("sport without physical feature");
     assertMatch: "node sport=tennis";