diff --git a/coal.json b/coal.json
index 1ac92b17d..ff1191343 100644
--- a/coal.json
+++ b/coal.json
@@ -26,6 +26,10 @@
             "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
             "{% elseif tags.man_made %}",
             "{{ tagTrans('man_made', tags.man_made) }}",
+            "{% elseif tags.power == 'plant' %}",
+            "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
+            "{% elseif tags.landuse == 'quarry' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} {% if tags.resource %}({{ tagTrans('resource', tags.resource) }}){% endif %}",
             "{% elseif tags.landuse == 'industrial' %}",
             "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
             "{% endif %}"
diff --git a/oil_gas.json b/oil_gas.json
index 6ce7d9ae6..96aa12601 100644
--- a/oil_gas.json
+++ b/oil_gas.json
@@ -1,8 +1,8 @@
 {
     "type": "overpass",
     "name": {
-        "de": "Erdgas",
-        "en": "Natural gas"
+        "de": "Erdöl und Erdgas",
+        "en": "Petroleum and natural gas"
     },
     "query": {
         "11": [
@@ -49,10 +49,12 @@
             "{{ tagTrans('man_made', 'pipeline') }} ({{ tagTrans('substance', tags.substance) }})",
             "{% elseif tags.man_made %}",
             "{{ tagTrans('man_made', tags.man_made) }}",
-            "{% elseif tags.landuse == 'industrial' %}",
-            "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
+            "{% elseif tags.power == 'plant' %}",
+            "{{ tagTrans('power', 'plant') }} {% if attribute(tags, 'generator:source') %}({{ tagTransList('generator:source', attribute(tags, 'generator:source')) }}){% endif %}",
             "{% elseif tags.waterway == 'offshore_field' %}",
             "{{ tagTrans('waterway', tags.waterway) }}",
+            "{% elseif tags.landuse == 'industrial' %}",
+            "{{ tagTrans('landuse', tags.landuse) }} ({{ tagTrans('industrial', tags.industrial) }})",
             "{% endif %}"
         ],
         "markerSymbol": null