Index: trunk/resources/data/validator/combinations.mapcss
===================================================================
--- trunk/resources/data/validator/combinations.mapcss	(revision 17324)
+++ trunk/resources/data/validator/combinations.mapcss	(revision 17410)
@@ -109,7 +109,5 @@
 }
 
-/* {0.key} without {1.tag} or {2.tag}, #15107 */
-*[iata                         ][aeroway!=aerodrome][aeroway!=helipad],
-*[icao                         ][aeroway!=aerodrome][aeroway!=helipad],
+/* {0.key} without {1.tag} or {2.tag} */
 *[bridge:movable               ][bridge!=movable][man_made!=bridge],
 *[substation                   ][power!=substation][pipeline!=substation],
@@ -117,4 +115,11 @@
 way[waterway=pressurised       ][tunnel!=flooded][man_made!=pipeline] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
+  group: tr("missing tag");
+}
+
+/* {0.key} without {1.tag}, {2.tag} or {3.tag}, #15107, #20241 */
+*[iata                         ][aeroway!=aerodrome][aeroway!=heliport][aeroway!=helipad],
+*[icao                         ][aeroway!=aerodrome][aeroway!=heliport][aeroway!=helipad] {
+  throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.tag}", "{2.tag}", "{3.tag}");
   group: tr("missing tag");
 }