Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 15311)
+++ trunk/data/validator/combinations.mapcss	(revision 15325)
@@ -116,5 +116,7 @@
 }
 
-/* {0.key} without {1.tag} or {2.tag} */
+/* {0.key} without {1.tag} or {2.tag}, #15107 */
+*[iata                         ][aeroway!=aerodrome][aeroway!=helipad],
+*[icao                         ][aeroway!=aerodrome][aeroway!=helipad],
 *[bridge:movable               ][bridge!=movable][man_made!=bridge],
 *[substation                   ][power!=substation][pipeline!=substation],
@@ -147,5 +149,7 @@
 }
 
-/* {0.tag} without {1.key} (info level) */
+/* {0.tag} without {1.key} (info level), #15107 */
+*[aeroway=runway               ][!ref],
+*[aeroway=runway               ][!surface],
 way[highway=track              ][!tracktype],
 way[power=cable                ][!location],