diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index e3c65c4907..c2911052c3 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -2200,7 +2200,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:voltage={{commonVoltages}} V",
+            "if": "{{key}}:voltage={{commonVoltages}}",
             "then": {
               "en": "{{description}} outputs {{commonVoltages}} volt",
               "nl": "{{description}} heeft een spanning van {{commonVoltages}} volt",
@@ -2238,7 +2238,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:current={{commonCurrent}} A",
+            "if": "{{key}}:current={{commonCurrent}}",
             "then": {
               "en": "{{description}} outputs at most {{commonCurrent}} A",
               "nl": "{{description}} levert een stroom van maximaal {{commonCurrent}} A",
diff --git a/assets/layers/charging_station/charging_station.proto.json b/assets/layers/charging_station/charging_station.proto.json
index 8329088bb8..7f23bb6eeb 100644
--- a/assets/layers/charging_station/charging_station.proto.json
+++ b/assets/layers/charging_station/charging_station.proto.json
@@ -266,7 +266,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:voltage={{commonVoltages}} V",
+            "if": "{{key}}:voltage={{commonVoltages}}",
             "then": {
               "en": "{{description}} outputs {{commonVoltages}} volt",
               "nl": "{{description}} heeft een spanning van {{commonVoltages}} volt",
@@ -299,7 +299,7 @@
             "type": "pfloat"
           },
           "mappings": {
-            "if": "{{key}}:current={{commonCurrent}} A",
+            "if": "{{key}}:current={{commonCurrent}}",
             "then": {
               "en": "{{description}} outputs at most {{commonCurrent}} A",
               "nl": "{{description}} levert een stroom van maximaal {{commonCurrent}} A"
@@ -332,8 +332,8 @@
           "mappings": {
             "if": "{{key}}:output={{commonOutput}}",
             "then": {
-              "en": "{{description}} outputs at most {{commonOutput}} A",
-              "nl": "{{description}} levert een vermogen van maximaal {{commonOutput}} A"
+              "en": "{{description}} outputs at most {{commonOutput}} kW",
+              "nl": "{{description}} levert een vermogen van maximaal {{commonOutput}} kW"
             }
           },
           "condition": {
diff --git a/langs/layers/de.json b/langs/layers/de.json
index d3c5a3a1a0..1a1e9a8643 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -2732,7 +2732,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} liefert maximal {{commonOutput}} A"
+                            "then": "{{description}} liefert maximal {{commonOutput}}"
                         },
                         "question": "Welche Leistung liefert ein einzelner Stecker des Typs {{description}}?",
                         "render": "{{description}} liefert maximal {canonical({{key}}:output)}"
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 77d1c74741..def75a0240 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -2761,7 +2761,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} outputs at most {{commonOutput}} A"
+                            "then": "{{description}} outputs at most {{commonOutput}}"
                         },
                         "question": "What power output does a single plug of type {{description}} offer?",
                         "render": "{{description}} outputs at most {canonical({{key}}:output)}"
diff --git a/langs/layers/es.json b/langs/layers/es.json
index 5ab43f9763..b55a00b081 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -2724,7 +2724,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} entrega como máximo {{commonOutput}} A"
+                            "then": "{{description}} entrega como máximo {{commonOutput}}"
                         },
                         "question": "¿Qué potencia de salida ofrece un solo enchufe del tipo {{description}}?",
                         "render": "{{description}} entrega como máximo {canonical({{key}}:output)}"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 6cf397a2cb..4250049cf1 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -2728,7 +2728,7 @@
                     },
                     "3": {
                         "mappings": {
-                            "then": "{{description}} levert een vermogen van maximaal {{commonOutput}} A"
+                            "then": "{{description}} levert een vermogen van maximaal {{commonOutput}}"
                         },
                         "question": "Welk vermogen levert een enkele stekker van type {{description}}?",
                         "render": "{{description}} levert een vermogen van maximaal {canonical({{key}}:output)}"