diff --git a/taginfo.json b/taginfo.json
index 7fa8f3f..1fb79aa 100644
--- a/taginfo.json
+++ b/taginfo.json
@@ -125,10 +125,22 @@
     {
       "key": "layer"
     },
+    {
+      "key": "aeroway",
+      "value": "gate"
+    },
     {
       "key": "emergency",
       "value": "defibrillator"
     },
+    {
+      "key": "emergency",
+      "value": "phone"
+    },
+    {
+      "key": "emergency",
+      "value": "fire_extinguisher"
+    },
     {
       "key": "railway",
       "value": "halt"