diff --git a/data/presets/amenity/charging_station.json b/data/presets/amenity/charging_station.json
index d6a65fb3..b6d87612 100644
--- a/data/presets/amenity/charging_station.json
+++ b/data/presets/amenity/charging_station.json
@@ -8,14 +8,36 @@
         "fee",
         "payment_multi_fee",
         "charge_fee",
-        "ref"
+        "ref",
+        "opening_hours",
+        "name",
+        "address"
     ],
     "moreFields": [
         "covered",
         "level",
         "manufacturer",
         "maxstay",
-        "network"
+        "network",
+        "operator:wikidata",
+        "website",
+        "socket:cee_blue",
+        "socket:chademo:output",
+        "socket:chademo",
+        "socket:schuko",
+        "socket:tesla_destination",
+        "socket:tesla_supercharger_ccs:output",
+        "socket:tesla_supercharger_ccs",
+        "socket:tesla_supercharger:output",
+        "socket:tesla_supercharger",
+        "socket:type1",
+        "socket:type2_cable:output",
+        "socket:type2_cable",
+        "socket:type2_combo:output",
+        "socket:type2_combo",
+        "socket:type2:output",
+        "socket:type2",
+        "socket:typee"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/man_made/charge_point.json b/data/presets/man_made/charge_point.json
index a4659658..51f81f54 100644
--- a/data/presets/man_made/charge_point.json
+++ b/data/presets/man_made/charge_point.json
@@ -6,7 +6,26 @@
     ],
     "moreFields": [
         "level",
-        "manufacturer"
+        "manufacturer",
+        "operator",
+        "operator:wikidata",
+        "socket:cee_blue",
+        "socket:chademo:output",
+        "socket:chademo",
+        "socket:schuko",
+        "socket:tesla_destination",
+        "socket:tesla_supercharger_ccs:output",
+        "socket:tesla_supercharger_ccs",
+        "socket:tesla_supercharger:output",
+        "socket:tesla_supercharger",
+        "socket:type1",
+        "socket:type2_cable:output",
+        "socket:type2_cable",
+        "socket:type2_combo:output",
+        "socket:type2_combo",
+        "socket:type2:output",
+        "socket:type2",
+        "socket:typee"
     ],
     "geometry": [
         "point"