diff --git a/pt_amenities.json b/pt_amenities.json
index 7d30a47..a7f33de 100644
--- a/pt_amenities.json
+++ b/pt_amenities.json
@@ -15,16 +15,35 @@
         "uk": "Amenities"
     },
     "query": {
-        "14": [
+        "8": [
+            "(",
+            "nwr[aeroway=aerodrome]['aerodrome:type'~'(international)'];",
+            ")"
+        ],
+        "10": [
+            "(",
+            "nwr[aeroway=aerodrome]['aerodrome:type'~'(international|regional|public)'];",
+            ")"
+        ],
+        "12": [
+            "(",
+            "nwr[aeroway=aerodrome];",
+            ")"
+        ],
+        "16": [
             "(",
             "nwr[amenity~\"^(taxi|ticket_counter)$\"];",
             "nwr[railway~\"^(subway_entrance)$\"];",
+            "nwr[aeroway=aerodrome];",
             ")"
         ]
     },
     "feature": {
         "pre": [
-            "{% if tags.railway == 'subway_entrance' %}",
+            "{% if tags.aeroway == 'aerodrome' %}",
+            "  {% set key = 'aeroway' %}",
+            "  {% set value = tags.aeroway %}",
+            "{% elseif tags.railway == 'subway_entrance' %}",
             "  {% set key = 'railway' %}",
             "  {% set value = tags.railway %}",
             "{% else %}",
@@ -32,12 +51,13 @@
             "  {% set value = tags.amenity %}",
             "{% endif %}"
         ],
-        "description": "{{ tagTrans(key, value) }}",
-        "markerSign": "{{ const[value] }}"
+        "description": "{{ debug(key, value) }}{{ tagTrans(key, value) }}",
+        "markerSign": "{{ const[value]|raw }}"
     },
     "const": {
         "taxi": "🚖",
         "ticket_counter": "🎫",
-        "subway_entrance": "🚉"
+        "subway_entrance": "🚉",
+        "aerodrome": "<i class='fas fa-plane-departure'></i>"
     }
 }