diff --git a/emergency.json b/emergency.json
index 361337c..e89dbc0 100644
--- a/emergency.json
+++ b/emergency.json
@@ -33,7 +33,7 @@
             "node[amenity~\"^(fire_station|hospital|police)$\"];",
             "way[amenity~\"^(fire_station|hospital|police)$\"];",
             "relation[amenity~\"^(fire_station|hospital|police)$\"];",
-            "node[emergency~\"^(phone)$\"];",
+            "node[emergency~\"^(phone|fire_hydrant|water_tank)$\"];",
             "node[highway=emergency_access_point];",
             ")"
         ]
@@ -122,6 +122,14 @@
                 "emergency_access_point": {
                     "name": "{{ tagTrans('highway', 'emergency_access_point') }}",
                     "query": "node[highway=emergency_access_point]"
+                },
+                "emergency_fire_hydrant": {
+                    "name": "{{ tagTrans('emergency', 'fire_hydrant') }}",
+                    "query": "node[emergency=fire_hydrant]"
+                },
+                "emergency_water_tank": {
+                    "name": "{{ tagTrans('emergency', 'water_tank') }}",
+                    "query": "node[emergency=water_tank]"
                 }
             }
         }