diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index dba19474e3..b6ec702bc0 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -3148,8 +3148,8 @@
         {
           "if": "no:network=yes",
           "then": {
-            "en": "Not part of a bigger network",
-            "nl": "Maakt geen deel uit van een groter netwerk"
+            "en": "Not part of a bigger network, e.g. because the charging station is maintained by a local business",
+            "nl": "Maakt geen deel uit van een groter netwerk, een lokale zaak of organisatie beheert dit oplaadpunt"
           }
         },
         {
@@ -3169,8 +3169,32 @@
           "then": "Blink"
         },
         {
-          "if": "network=eVgo",
-          "then": "eVgo"
+          "if": "network=EVgo",
+          "then": "EVgo",
+          "addExtraTags": [
+            "brand:wikidata=Q61803820"
+          ]
+        },
+        {
+          "if": "network=Allego",
+          "then": "Allego",
+          "addExtraTags": [
+            "brand:wikidata=Q75560554"
+          ]
+        },
+        {
+          "if": "network=Blue Corner",
+          "then": "Blue Corner",
+          "addExtraTags": [
+            "brand:wikidata=Q106902344"
+          ]
+        },
+        {
+          "if": "network=Tesla",
+          "then": "Tesla",
+          "addExtraTags": [
+            "brand:wikidata=Q478214"
+          ]
         }
       ]
     },
@@ -3203,7 +3227,8 @@
           ],
           "hideInAnswer": "operator="
         }
-      ]
+      ],
+      "condition": "network="
     },
     {
       "id": "phone",
diff --git a/assets/layers/charging_station/charging_station.protojson b/assets/layers/charging_station/charging_station.protojson
index 985f383124..53e8ab56d3 100644
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@@ -438,8 +438,8 @@
         {
           "if": "no:network=yes",
           "then": {
-            "en": "Not part of a bigger network",
-            "nl": "Maakt geen deel uit van een groter netwerk"
+            "en": "Not part of a bigger network, e.g. because the charging station is maintained by a local business",
+            "nl": "Maakt geen deel uit van een groter netwerk, een lokale zaak of organisatie beheert dit oplaadpunt"
           }
         },
         {
@@ -459,8 +459,32 @@
           "then": "Blink"
         },
         {
-          "if": "network=eVgo",
-          "then": "eVgo"
+          "if": "network=EVgo",
+          "then": "EVgo",
+          "addExtraTags": [
+            "brand:wikidata=Q61803820"
+          ]
+        },
+        {
+          "if": "network=Allego",
+          "then": "Allego",
+          "addExtraTags": [
+            "brand:wikidata=Q75560554"
+          ]
+        },
+        {
+          "if": "network=Blue Corner",
+          "then": "Blue Corner",
+          "addExtraTags": [
+            "brand:wikidata=Q106902344"
+          ]
+        },
+        {
+          "if": "network=Tesla",
+          "then": "Tesla",
+          "addExtraTags": [
+            "brand:wikidata=Q478214"
+          ]
         }
       ]
     },
@@ -493,7 +517,8 @@
           ],
           "hideInAnswer": "operator="
         }
-      ]
+      ],
+      "condition": "network="
     },
     {
       "id": "phone",
diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 5dcedd59b8..ee829ff834 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -310,7 +310,9 @@
               "nobrand="
             ]
           },
-          "addExtraTags": ["brand:wikidata=Q6650101"]
+          "addExtraTags": [
+            "brand:wikidata=Q6650101"
+          ]
         },
         {
           "if": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 0289f0ff8c..8b47118b02 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1197,7 +1197,7 @@
             "Network": {
                 "mappings": {
                     "0": {
-                        "then": "Not part of a bigger network"
+                        "then": "Not part of a bigger network, e.g. because the charging station is maintained by a local business"
                     },
                     "1": {
                         "then": "Not part of a bigger network"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 5891e17056..4cc651bd33 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1273,7 +1273,7 @@
             "Network": {
                 "mappings": {
                     "0": {
-                        "then": "Maakt geen deel uit van een groter netwerk"
+                        "then": "Maakt geen deel uit van een groter netwerk, een lokale zaak of organisatie beheert dit oplaadpunt"
                     },
                     "1": {
                         "then": "Maakt geen deel uit van een groter netwerk"
@@ -3009,6 +3009,13 @@
             "render": "Witte Fiets"
         }
     },
+    "gps_track": {
+        "tagRenderings": {
+            "Privacy notice": {
+                "render": "Dit is waar je was sinds je deze website hebt geopened. Dit is enkel zichtbaar voor jou en niemand anders, je locatie wordt niet verstuurd"
+            }
+        }
+    },
     "grass_in_parks": {
         "name": "Toegankelijke grasvelden in parken",
         "title": {