diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 91d305c3f..1828087e2 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -330,14 +330,79 @@
           },
           "hideInAnswer": {
             "or": [
-              "_country!=be",
+              "_country!=af",
+              "_country!=al",
+              "_country!=dz",
+              "_country!=as",
+              "_country!=ad",
+              "_country!=ao",
+              "_country!=am",
+              "_country!=aw",
+              "_country!=az",
+              "_country!=by",
+              "_country!=bt",
+              "_country!=ba",
+              "_country!=bg",
+              "_country!=cv",
+              "_country!=td",
+              "_country!=cl",
+              "_country!=hr",
+              "_country!=dk",
+              "_country!=eg",
+              "_country!=ee",
+              "_country!=et",
+              "_country!=fo",
               "_country!=fr",
-              "_country!=ma",
-              "_country!=tn",
-              "_country!=pl",
-              "_country!=cs",
+              "_country!=pf",
+              "_country!=ge",
+              "_country!=gr",
+              "_country!=gl",
+              "_country!=gn",
+              "_country!=gw",
+              "_country!=is",
+              "_country!=id",
+              "_country!=ir",
+              "_country!=jo",
+              "_country!=kz",
+              "_country!=kg",
+              "_country!=la",
+              "_country!=lv",
+              "_country!=lr",
+              "_country!=ly",
+              "_country!=lt",
+              "_country!=lu",
+              "_country!=mo",
+              "_country!=mr",
+              "_country!=md",
+              "_country!=mc",
+              "_country!=mn",
+              "_country!=me",
+              "_country!=mz",
+              "_country!=nl",
+              "_country!=nc",
+              "_country!=ne",
+              "_country!=kp",
+              "_country!=mk",
+              "_country!=pt",
+              "_country!=qa",
+              "_country!=ro",
+              "_country!=ru",
+              "_country!=rw",
+              "_country!=sm",
               "_country!=sk",
-              "_country!=mo"
+              "_country!=si",
+              "_country!=kr",
+              "_country!=es",
+              "_country!=sr",
+              "_country!=tj",
+              "_country!=th",
+              "_country!=tl",
+              "_country!=tr",
+              "_country!=tm",
+              "_country!=ua",
+              "_country!=uy",
+              "_country!=uz",
+              "_country!=vn"
             ]
           }
         },
@@ -378,6 +443,52 @@
           "icon": {
             "path": "./assets/layers/charging_station/TypeE.svg",
             "class": "medium"
+          },
+          "hideInAnswer": {
+            "or": [
+              "_country!=be",
+              "_country!=bj",
+              "_country!=bf",
+              "_country!=bi",
+              "_country!=cm",
+              "_country!=cf",
+              "_country!=td",
+              "_country!=km",
+              "_country!=cz",
+              "_country!=dk",
+              "_country!=dj",
+              "_country!=gq",
+              "_country!=et",
+              "_country!=fo",
+              "_country!=fr",
+              "_country!=gf",
+              "_country!=pf",
+              "_country!=gl",
+              "_country!=gp",
+              "_country!=gw",
+              "_country!=la",
+              "_country!=lr",
+              "_country!=mg",
+              "_country!=ml",
+              "_country!=mq",
+              "_country!=mr",
+              "_country!=mu",
+              "_country!=mc",
+              "_country!=mn",
+              "_country!=ma",
+              "_country!=ne",
+              "_country!=pl",
+              "_country!=pt",
+              "_country!=rw",
+              "_country!=mf",
+              "_country!=pm",
+              "_country!=sn",
+              "_country!=sk",
+              "_country!=sy",
+              "_country!=tl",
+              "_country!=tn",
+              "_country!=uz"
+            ]
           }
         },
         {
diff --git a/assets/layers/charging_station/types.csv b/assets/layers/charging_station/types.csv
index d31c004ba..8d9795616 100644
--- a/assets/layers/charging_station/types.csv
+++ b/assets/layers/charging_station/types.csv
@@ -1,6 +1,6 @@
 key,image,description:en,countryWhiteList,countryBlackList,commonVoltages,commonCurrents,commonOutputs,description:nl,associatedVehicleTypes,neverAssociatedWith,extraVisualisationCondition
-socket:schuko,CEE7_4F.svg,<b>Schuko wall plug</b> without ground pin (CEE7/4 type F),be;fr;ma;tn;pl;cs;sk;mo,,230,16,3.6 kW,<b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F),*,,
-socket:typee,TypeE.svg,<b>European wall plug</b> with ground pin (CEE7/4 type E),,,230,16,3 kW;22 kW;,<b>Europese stekker</b> met aardingspin (CEE7/4 type E),*,,
+socket:schuko,CEE7_4F.svg,<b>Schuko wall plug</b> without ground pin (CEE7/4 type F),af;al;dz;as;ad;ao;am;aw;az;by;bt;ba;bg;cv;td;cl;hr;dk;eg;ee;et;fo;fr;pf;ge;gr;gl;gn;gw;is;id;ir;jo;kz;kg;la;lv;lr;ly;lt;lu;mo;mr;md;mc;mn;me;mz;nl;nc;ne;kp;mk;pt;qa;ro;ru;rw;sm;sk;si;kr;es;sr;tj;th;tl;tr;tm;ua;uy;uz;vn,,230,16,3.6 kW,<b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F),*,,
+socket:typee,TypeE.svg,<b>European wall plug</b> with ground pin (CEE7/4 type E),be;bj;bf;bi;cm;cf;td;km;cz;dk;dj;gq;et;fo;fr;gf;pf;gl;gp;gw;la;lr;mg;ml;mq;mr;mu;mc;mn;ma;ne;pl;pt;rw;mf;pm;sn;sk;sy;tl;tn;uz,,230,16,3 kW;22 kW;,<b>Europese stekker</b> met aardingspin (CEE7/4 type E),*,,
 socket:chademo,Chademo_type4.svg,<b>Chademo</b>,,,500,120,50 kW,<b>Chademo</b>,car;motorcar;hgv;bus,bicycle;scooter,
 socket:type1_cable,Type1_J1772.svg,<b>Type 1 with cable</b> (J1772),,,200;240,32,3.7 kW;7 kW,<b>Type 1 met kabel</b> (J1772),car;motorcar;hgv;bus,bicycle;scooter,
 socket:type1,Type1_J1772.svg,<b>Type 1 <i>without</i> cable</b> (J1772),,,200;240,32,3.7 kW;6.6 kW;7 kW;7.2 kW,<b>Type 1 <i>zonder</i> kabel</b> (J1772),car;motorcar;hgv;bus,bicycle;scooter,