diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index 3969e0e2dc..7fe3402a1f 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -122,7 +122,7 @@
       "question": {
         "en": "What is the type of this artwork?",
         "nl": "Wat voor soort kunstwerk is dit?",
-        "fr": "Quel est le type de cette œuvre d'art?",
+        "fr": "Quel est le type de cette œuvre d'art ?",
         "de": "Was ist die Art dieses Kunstwerks?",
         "it": "Che tipo di opera d’arte è questo?",
         "ru": "К какому типу относится эта работа?",
diff --git a/assets/layers/barrier/barrier.json b/assets/layers/barrier/barrier.json
index b481674b81..fd29db7e85 100644
--- a/assets/layers/barrier/barrier.json
+++ b/assets/layers/barrier/barrier.json
@@ -34,7 +34,8 @@
           "en": "Bollard",
           "nl": "Paaltje",
           "de": "Poller",
-          "ru": "Прикол"
+          "ru": "Прикол",
+          "fr": "Bollard"
         }
       },
       {
@@ -53,7 +54,8 @@
         "en": "Bollard",
         "nl": "Paaltje",
         "de": "Poller",
-        "ru": "Прикол"
+        "ru": "Прикол",
+        "fr": "Bollard"
       },
       "tags": [
         "barrier=bollard"
@@ -107,7 +109,8 @@
           "then": {
             "en": "A cyclist can go past this.",
             "nl": "Een fietser kan hier langs.",
-            "de": "Ein Radfahrer kann hindurchfahren."
+            "de": "Ein Radfahrer kann hindurchfahren.",
+            "fr": "Un cycliste peut franchir ceci."
           }
         },
         {
@@ -115,7 +118,8 @@
           "then": {
             "en": "A cyclist can not go past this.",
             "nl": "Een fietser kan hier niet langs.",
-            "de": "Ein Radfahrer kann nicht hindurchfahren."
+            "de": "Ein Radfahrer kann nicht hindurchfahren.",
+            "fr": "Un cycliste ne peut pas franchir ceci."
           }
         }
       ],
@@ -125,7 +129,8 @@
       "question": {
         "en": "What kind of bollard is this?",
         "nl": "Wat voor soort paal is dit?",
-        "de": "Um was für einen Poller handelt es sich?"
+        "de": "Um was für einen Poller handelt es sich?",
+        "fr": "Quel est le type de bollard (borne) ?"
       },
       "condition": "barrier=bollard",
       "mappings": [
@@ -134,7 +139,8 @@
           "then": {
             "en": "Removable bollard",
             "nl": "Verwijderbare paal",
-            "de": "Entfernbarer Poller"
+            "de": "Entfernbarer Poller",
+            "fr": "Bollard amovible"
           }
         },
         {
@@ -142,7 +148,8 @@
           "then": {
             "en": "Fixed bollard",
             "nl": "Vaste paal",
-            "de": "Feststehender Poller"
+            "de": "Feststehender Poller",
+            "fr": "Bollard fixe"
           }
         },
         {
@@ -150,7 +157,8 @@
           "then": {
             "en": "Bollard that can be folded down",
             "nl": "Paal die platgevouwen kan worden",
-            "de": "Umlegbarer Poller"
+            "de": "Umlegbarer Poller",
+            "fr": "Bollard qui peut être couché"
           }
         },
         {
@@ -158,7 +166,8 @@
           "then": {
             "en": "Flexible bollard, usually plastic",
             "nl": "Flexibele paal, meestal plastic",
-            "de": "Flexibler Poller, meist aus Kunststoff"
+            "de": "Flexibler Poller, meist aus Kunststoff",
+            "fr": "Bollard flexible, généralement en plastique"
           }
         },
         {
@@ -166,7 +175,8 @@
           "then": {
             "en": "Rising bollard",
             "nl": "Verzonken poller",
-            "de": "Ausfahrender Poller"
+            "de": "Ausfahrender Poller",
+            "fr": "Bollard rétractable"
           }
         }
       ],
@@ -219,7 +229,8 @@
       "render": {
         "en": "Maximum width: {maxwidth:physical} m",
         "nl": "Maximumbreedte: {maxwidth:physical} m",
-        "de": "Maximale Durchfahrtsbreite: {maxwidth:physical} m"
+        "de": "Maximale Durchfahrtsbreite: {maxwidth:physical} m",
+        "fr": "Largeur maximale: {maxwidth:physical} m"
       },
       "question": {
         "en": "How wide is the gap left over besides the barrier?",
@@ -273,7 +284,8 @@
       "render": {
         "en": "Width of opening: {width:opening} m",
         "nl": "Breedte van de opening: {width:opening} m",
-        "de": "Breite der Öffnung: {width:opening} m"
+        "de": "Breite der Öffnung: {width:opening} m",
+        "fr": "Largeur de l'ouverture : {width:opening} m"
       },
       "question": {
         "en": "How wide is the smallest opening next to the barriers?",
diff --git a/assets/layers/bench_at_pt/bench_at_pt.json b/assets/layers/bench_at_pt/bench_at_pt.json
index 681aff3ad6..e8ef9f62ad 100644
--- a/assets/layers/bench_at_pt/bench_at_pt.json
+++ b/assets/layers/bench_at_pt/bench_at_pt.json
@@ -125,7 +125,8 @@
         {
           "if": "bench=yes",
           "then": {
-            "en": "There is a normal, sit-down bench here"
+            "en": "There is a normal, sit-down bench here",
+            "fr": "Il y a un banc normal pour s'asseoir ici"
           }
         },
         {
@@ -144,7 +145,8 @@
         {
           "if": "bench=no",
           "then": {
-            "en": "There is no bench here"
+            "en": "There is no bench here",
+            "fr": "Il n'y a pas de banc ici"
           }
         }
       ]
diff --git a/assets/layers/bike_repair_station/bike_repair_station.json b/assets/layers/bike_repair_station/bike_repair_station.json
index 0e37ac26ad..58290f186c 100644
--- a/assets/layers/bike_repair_station/bike_repair_station.json
+++ b/assets/layers/bike_repair_station/bike_repair_station.json
@@ -239,7 +239,8 @@
       "question": {
         "en": "What is the email address of the maintainer?",
         "nl": "Wat is het email-adres van de beheerder?",
-        "de": "Wie lautet die E-Mail-Adresse des Betreuers?"
+        "de": "Wie lautet die E-Mail-Adresse des Betreuers?",
+        "fr": "Quelle est l'adresse email du service de maintenance ?"
       },
       "freeform": {
         "key": "email",
@@ -252,7 +253,8 @@
       "question": {
         "en": "What is the phone number of the maintainer?",
         "nl": "Wat is het telefoonnummer van de beheerder?",
-        "de": "Wie lautet die Telefonnummer des Betreibers?"
+        "de": "Wie lautet die Telefonnummer des Betreibers?",
+        "fr": "Quel est le numéro de téléphone du service de maintenance ?"
       },
       "freeform": {
         "key": "phone",
diff --git a/assets/layers/binocular/binocular.json b/assets/layers/binocular/binocular.json
index 2ad39b353f..60fd228c19 100644
--- a/assets/layers/binocular/binocular.json
+++ b/assets/layers/binocular/binocular.json
@@ -89,7 +89,8 @@
       "description": {
         "en": "A telescope or pair of binoculars mounted on a pole, available to the public to look around. <img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />",
         "nl": "Een telescoop of verrekijker die op een vaste plaats gemonteerd staat waar iedereen door mag kijken. <img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />",
-        "de": "Ein fest installiertes Teleskop oder Fernglas, für die öffentliche Nutzung. <img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />"
+        "de": "Ein fest installiertes Teleskop oder Fernglas, für die öffentliche Nutzung. <img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />",
+        "fr": "Une longue-vue ou une paire de jumelles montée sur un poteau, disponible au public pour scruter les environs.\n<img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />"
       },
       "preciseInput": {
         "preferredBackground": "photo"
diff --git a/assets/layers/birdhide/birdhide.json b/assets/layers/birdhide/birdhide.json
index b0d0bbb854..e058124a64 100644
--- a/assets/layers/birdhide/birdhide.json
+++ b/assets/layers/birdhide/birdhide.json
@@ -241,7 +241,8 @@
           "question": {
             "nl": "Rolstoeltoegankelijk",
             "en": "Wheelchair accessible",
-            "de": "Zugänglich für Rollstuhlfahrer"
+            "de": "Zugänglich für Rollstuhlfahrer",
+            "fr": "Accessible aux fauteuils roulants"
           },
           "osmTags": {
             "or": [
diff --git a/assets/layers/cafe_pub/cafe_pub.json b/assets/layers/cafe_pub/cafe_pub.json
index 9b6ab97a3e..3cd6b73c92 100644
--- a/assets/layers/cafe_pub/cafe_pub.json
+++ b/assets/layers/cafe_pub/cafe_pub.json
@@ -3,7 +3,8 @@
   "name": {
     "nl": "Cafés",
     "en": "Cafés and pubs",
-    "de": "Cafés und Kneipen"
+    "de": "Cafés und Kneipen",
+    "fr": "Cafés et pubs"
   },
   "source": {
     "osmTags": {
@@ -94,12 +95,14 @@
       "question": {
         "nl": "Wat is de naam van dit café?",
         "en": "What is the name of this pub?",
-        "de": "Wie heißt diese Kneipe?"
+        "de": "Wie heißt diese Kneipe?",
+        "fr": "Quel est le nom de ce pub ?"
       },
       "render": {
         "nl": "De naam van dit café is {name}",
         "en": "This pub is named {name}",
-        "de": "Diese Kneipe heißt {name}"
+        "de": "Diese Kneipe heißt {name}",
+        "fr": "Ce pub se nomme {name}"
       },
       "freeform": {
         "key": "name"
@@ -164,7 +167,8 @@
           "question": {
             "en": "Opened now",
             "nl": "Nu geopened",
-            "de": "Jetzt geöffnet"
+            "de": "Jetzt geöffnet",
+            "fr": "Ouvert maintenant"
           },
           "osmTags": "_isOpen=yes"
         }
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 05c840ab67..ee3ad6c9d5 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -3140,8 +3140,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"
           }
         },
         {
@@ -3161,8 +3161,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"
+          ]
         }
       ]
     },
@@ -3195,7 +3219,8 @@
           ],
           "hideInAnswer": "operator="
         }
-      ]
+      ],
+      "condition": "network="
     },
     {
       "id": "phone",
diff --git a/assets/layers/ghost_bike/ghost_bike.json b/assets/layers/ghost_bike/ghost_bike.json
index be4b2292e2..feb1faf5a3 100644
--- a/assets/layers/ghost_bike/ghost_bike.json
+++ b/assets/layers/ghost_bike/ghost_bike.json
@@ -15,7 +15,7 @@
     "nb_NO": "Spøkelsessykler",
     "pl": "Duch roweru",
     "pt_BR": "Bicicleta fantasma",
-    "ru": "Велосипед Ghost",
+    "ru": "Велосипед ghost",
     "sv": "Spökcykel",
     "zh_Hant": "幽靈單車",
     "pt": "Bicicleta fantasma"
@@ -65,7 +65,20 @@
         "nl": "Witte fiets",
         "de": "Geisterrad",
         "it": "Bici fantasma",
-        "fr": "Vélo fantôme"
+        "fr": "Vélo fantôme",
+        "eo": "Fantombiciklo",
+        "es": "Bicicleta blanca",
+        "fi": "Haamupyörä",
+        "gl": "Bicicleta pantasma",
+        "hu": "Emlékkerékpár",
+        "ja": "ゴーストバイク",
+        "nb_NO": "Spøkelsessykler",
+        "pl": "Duch roweru",
+        "pt": "Bicicleta fantasma",
+        "pt_BR": "Bicicleta fantasma",
+        "ru": "Велосипед ghost",
+        "sv": "Spökcykel",
+        "zh_Hant": "幽靈單車"
       },
       "tags": [
         "historic=memorial",
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/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index 16924328e8..7996d1bb3b 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -14,7 +14,8 @@
       "pt": "Qual é a entidade Wikidata correspondente?",
       "hu": "Mi a megfelelő Wikidata-elem?",
       "it": "Qual è l’elemento Wikidata corrispondente?",
-      "nb_NO": "Hva er respektivt Wikipedia-element?"
+      "nb_NO": "Hva er respektivt Wikipedia-element?",
+      "fr": "Quelle est l'entité Wikidata correspondante ?"
     },
     "mappings": [
       {
@@ -26,7 +27,8 @@
           "pt": "Ainda não foi vinculada nenhuma página da Wikipédia",
           "hu": "Még nincs Wikipédia-oldal belinkelve",
           "it": "Nessuna pagina Wikipedia è ancora stata collegata",
-          "nb_NO": "Ingen Wikipedia-side lenket enda"
+          "nb_NO": "Ingen Wikipedia-side lenket enda",
+          "fr": "Pas encore de lien vers une page Wikipedia"
         },
         "hideInAnswer": true
       }
@@ -96,7 +98,8 @@
           "pt": "Não vinculado à Wikipédia",
           "hu": "Nincs belinkelve a Wikipédiához",
           "it": "Non collegato a Wikipedia",
-          "nb_NO": "Ikke lenket med Wikipedia"
+          "nb_NO": "Ikke lenket med Wikipedia",
+          "fr": "Non lié avec Wikipedia"
         }
       }
     ],
@@ -181,7 +184,8 @@
           "de": "Dieser Ort ist speziell für Rollstuhlfahrer eingerichtet",
           "hu": "Ez a hely kifejezetten kerekesszékeseknek lett kialakítva",
           "it": "Questo luogo è stato adattato per favorire le persone in sedia a rotelle",
-          "nb_NO": "Dette stedet er spesielt tilpasset rullestolsbrukere"
+          "nb_NO": "Dette stedet er spesielt tilpasset rullestolsbrukere",
+          "fr": "Cet endroit est spécialement adapté pour les usagers de fauteuils roulants"
         }
       },
       {
@@ -198,7 +202,8 @@
           "de": "Dieser Ort ist mit einem Rollstuhl leicht zu erreichen",
           "hu": "Ez a hely könnyedén elérhető kerekesszékkel",
           "it": "Questo luogo è facilmente raggiungibile con una sedia a rotelle",
-          "nb_NO": "Dette stedet kan enkelt besøkes med rullestol"
+          "nb_NO": "Dette stedet kan enkelt besøkes med rullestol",
+          "fr": "Cet endroit est facilement accessible avec un fauteuil roulant"
         }
       },
       {
@@ -272,7 +277,7 @@
           "nl": "honden zijn <b>niet</b> toegelaten",
           "pt": "Os cães <b>não</b> são permitidos",
           "de": "Hunde sind <b>nicht</b> erlaubt",
-          "fr": "Les chiens <b>ne</b> sont <b>pas</b> admis",
+          "fr": "Chiens <b>non</b> admis",
           "eo": "Hundoj estas <b>malpermesataj</b>",
           "hu": "Kutya <b>nem</b> vihető be",
           "it": "I cani <b>non</b> sono ammessi",
@@ -368,34 +373,41 @@
     "#": "service:socket describes if a pub, restaurant or café offers electricity to their customers.",
     "question": {
       "en": "Does this amenity have electrical outlets, available to customers when they are inside?",
-      "nl": "Zijn er stekkers beschikbaar voor klanten die binnen zitten?"
+      "nl": "Zijn er stekkers beschikbaar voor klanten die binnen zitten?",
+      "pt": "Esta infraestrutura tem tomadas elétricas, disponíveis para os clientes quando estão no interior?"
     },
     "mappings": [
       {
         "then": {
           "en": "There are plenty of domestic sockets available to customers seated indoors, where they can charge their electronics",
-          "nl": "Er zijn binnen veel stekkers beschikbaar voor klanten die electronica wensen op te laden"
+          "nl": "Er zijn binnen veel stekkers beschikbaar voor klanten die electronica wensen op te laden",
+          "pt": "Há muitas tomadas elétricas disponíveis para clientes sentados no interior, onde estes podem carregar os seus dispositivos eletrónicos"
         },
         "if": "service:electricity=yes"
       },
       {
         "then": {
           "en": "There are a few domestic sockets available to customers seated indoors, where they can charge their electronics",
-          "nl": "Er zijn binnen enkele stekkers beschikbaar voor klanten die electronica wensen op te laden"
+          "nl": "Er zijn binnen enkele stekkers beschikbaar voor klanten die electronica wensen op te laden",
+          "pt": "Há algumas tomadas elétricas disponíveis para clientes sentados no interior, onde estes podem carregar os seus dispositivos eletrónicos"
         },
         "if": "service:electricity=limited"
       },
       {
         "then": {
           "en": "There are no sockets available indoors to customers, but charging might be possible if the staff is asked",
-          "nl": "Er zijn binnen geen stekkers beschikbaar, maar electronica opladen kan indien men dit aan het personeel vraagt"
+          "nl": "Er zijn binnen geen stekkers beschikbaar, maar electronica opladen kan indien men dit aan het personeel vraagt",
+          "fr": "Il n'y a pas de prises disponibles à l'intérieur pour les clients, mais la recharge est peut-être possible sur demande auprès des employés",
+          "pt": "Não há tomadas elétricas disponíveis para clientes sentados no interior, mas pode-se pedir aos funcionários para carregar dispositivos eletrónicos"
         },
         "if": "service:electricity=ask"
       },
       {
         "then": {
           "en": "There are a no domestic sockets available to customers seated indoors",
-          "nl": "Er zijn binnen geen stekkers beschikbaar"
+          "nl": "Er zijn binnen geen stekkers beschikbaar",
+          "fr": "Il n'y a pas de prises secteur disponibles pour les clients assis à l'intérieur",
+          "pt": "Não há tomadas elétricas disponíveis para clientes sentados no interior"
         },
         "if": "service:electricity=no"
       }
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/eo.json b/langs/layers/eo.json
index 1230cf831a..219d02d912 100644
--- a/langs/layers/eo.json
+++ b/langs/layers/eo.json
@@ -78,13 +78,13 @@
     },
     "ghost_bike": {
         "name": "Fantombiciklo",
-        "title": {
-            "render": "Fantombiciklo"
-        },
         "presets": {
             "0": {
                 "title": "Fantombiciklo"
             }
+        },
+        "title": {
+            "render": "Fantombiciklo"
         }
     },
     "shops": {
@@ -187,4 +187,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/es.json b/langs/layers/es.json
index 92933ed029..52519c942b 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -136,13 +136,13 @@
     },
     "ghost_bike": {
         "name": "Bicicleta blanca",
-        "title": {
-            "render": "Bicicleta blanca"
-        },
         "presets": {
             "0": {
                 "title": "Bicicleta blanca"
             }
+        },
+        "title": {
+            "render": "Bicicleta blanca"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/fi.json b/langs/layers/fi.json
index a938894c2d..95b22ff318 100644
--- a/langs/layers/fi.json
+++ b/langs/layers/fi.json
@@ -112,13 +112,13 @@
     },
     "ghost_bike": {
         "name": "Haamupyörä",
-        "title": {
-            "render": "Haamupyörä"
-        },
         "presets": {
             "0": {
                 "title": "Haamupyörä"
             }
+        },
+        "title": {
+            "render": "Haamupyörä"
         }
     },
     "shops": {
@@ -132,4 +132,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 4c92c70232..207d7c57db 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -72,6 +72,58 @@
             "render": "Œuvre d'art"
         }
     },
+    "barrier": {
+        "presets": {
+            "0": {
+                "title": "Bollard"
+            }
+        },
+        "tagRenderings": {
+            "Bollard type": {
+                "mappings": {
+                    "0": {
+                        "then": "Bollard amovible"
+                    },
+                    "1": {
+                        "then": "Bollard fixe"
+                    },
+                    "2": {
+                        "then": "Bollard qui peut être couché"
+                    },
+                    "3": {
+                        "then": "Bollard flexible, généralement en plastique"
+                    },
+                    "4": {
+                        "then": "Bollard rétractable"
+                    }
+                },
+                "question": "Quel est le type de bollard (borne) ?"
+            },
+            "MaxWidth": {
+                "render": "Largeur maximale: {maxwidth:physical} m"
+            },
+            "Width of opening (cyclebarrier)": {
+                "render": "Largeur de l'ouverture : {width:opening} m"
+            },
+            "bicycle=yes/no": {
+                "mappings": {
+                    "0": {
+                        "then": "Un cycliste peut franchir ceci."
+                    },
+                    "1": {
+                        "then": "Un cycliste ne peut pas franchir ceci."
+                    }
+                }
+            }
+        },
+        "title": {
+            "mappings": {
+                "0": {
+                    "then": "Bollard"
+                }
+            }
+        }
+    },
     "bench": {
         "name": "Bancs",
         "presets": {
@@ -167,12 +219,12 @@
         "tagRenderings": {
             "bench_at_pt-bench_type": {
                 "mappings": {
-                    "1": {
-                        "then": "Banc assis debout"
-                    },
                     "0": {
                         "then": "Il y a un banc normal pour s'asseoir ici"
                     },
+                    "1": {
+                        "then": "Banc assis debout"
+                    },
                     "2": {
                         "then": "Il n'y a pas de banc ici"
                     }
@@ -535,6 +587,9 @@
                 },
                 "question": "Est-ce que cette pompe est électrique ?"
             },
+            "bike_repair_station-email": {
+                "question": "Quelle est l'adresse email du service de maintenance ?"
+            },
             "bike_repair_station-manometer": {
                 "mappings": {
                     "0": {
@@ -564,6 +619,9 @@
                 "question": "Qui maintient cette pompe à vélo ?",
                 "render": "Mantenue par {operator}"
             },
+            "bike_repair_station-phone": {
+                "question": "Quel est le numéro de téléphone du service de maintenance ?"
+            },
             "bike_repair_station-valves": {
                 "mappings": {
                     "0": {
@@ -578,12 +636,6 @@
                 },
                 "question": "Quelles valves sont compatibles ?",
                 "render": "Cette pompe est compatible avec les valves suivantes : {valves}"
-            },
-            "bike_repair_station-phone": {
-                "question": "Quel est le numéro de téléphone du service de maintenance ?"
-            },
-            "bike_repair_station-email": {
-                "question": "Quelle est l'adresse email du service de maintenance ?"
             }
         },
         "title": {
@@ -760,6 +812,42 @@
             "render": "Objet cycliste"
         }
     },
+    "binocular": {
+        "presets": {
+            "0": {
+                "description": "Une longue-vue ou une paire de jumelles montée sur un poteau, disponible au public pour scruter les environs.\n<img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />"
+            }
+        }
+    },
+    "birdhide": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Accessible aux fauteuils roulants"
+                    }
+                }
+            }
+        }
+    },
+    "cafe_pub": {
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Ouvert maintenant"
+                    }
+                }
+            }
+        },
+        "name": "Cafés et pubs",
+        "tagRenderings": {
+            "Name": {
+                "question": "Quel est le nom de ce pub ?",
+                "render": "Ce pub se nomme {name}"
+            }
+        }
+    },
     "defibrillator": {
         "name": "Défibrillateurs",
         "presets": {
@@ -1946,138 +2034,5 @@
         "title": {
             "render": "Point de vue"
         }
-    },
-    "barrier": {
-        "title": {
-            "mappings": {
-                "0": {
-                    "then": "Bollard"
-                }
-            }
-        },
-        "presets": {
-            "0": {
-                "title": "Bollard"
-            }
-        },
-        "tagRenderings": {
-            "Bollard type": {
-                "mappings": {
-                    "3": {
-                        "then": "Bollard flexible, généralement en plastique"
-                    },
-                    "0": {
-                        "then": "Bollard amovible"
-                    },
-                    "1": {
-                        "then": "Bollard fixe"
-                    },
-                    "2": {
-                        "then": "Bollard qui peut être couché"
-                    },
-                    "4": {
-                        "then": "Bollard rétractable"
-                    }
-                },
-                "question": "Quel est le type de bollard (borne) ?"
-            },
-            "MaxWidth": {
-                "render": "Largeur maximale: {maxwidth:physical} m"
-            },
-            "Width of opening (cyclebarrier)": {
-                "render": "Largeur de l'ouverture : {width:opening} m"
-            },
-            "bicycle=yes/no": {
-                "mappings": {
-                    "0": {
-                        "then": "Un cycliste peut franchir ceci."
-                    },
-                    "1": {
-                        "then": "Un cycliste ne peut pas franchir ceci."
-                    }
-                }
-            }
-        }
-    },
-    "cafe_pub": {
-        "tagRenderings": {
-            "Name": {
-                "question": "Quel est le nom de ce pub ?",
-                "render": "Ce pub se nomme {name}"
-            }
-        },
-        "filter": {
-            "0": {
-                "options": {
-                    "0": {
-                        "question": "Ouvert maintenant"
-                    }
-                }
-            }
-        },
-        "name": "Cafés et pubs"
-    },
-    "charging_station": {
-        "filter": {
-            "0": {
-                "options": {
-                    "0": {
-                        "question": "Tout type de véhicule"
-                    },
-                    "2": {
-                        "question": "Station de charge pour automobiles"
-                    },
-                    "1": {
-                        "question": "Station de charge pour vélos"
-                    }
-                }
-            }
-        },
-        "tagRenderings": {
-            "Authentication": {
-                "mappings": {
-                    "1": {
-                        "then": "Authentification par une app"
-                    },
-                    "7": {
-                        "then": "Charger ici est (aussi) possible sans authentification"
-                    },
-                    "0": {
-                        "then": "Authentification par carte de membre"
-                    },
-                    "4": {
-                        "then": "Authentification par NFC est disponible"
-                    },
-                    "6": {
-                        "then": "Authentification par carte de débit est disponible"
-                    },
-                    "2": {
-                        "then": "Authentification par appel téléphonique est disponible"
-                    },
-                    "3": {
-                        "then": "Authentification par SMS est disponible"
-                    }
-                },
-                "question": "Quelle sorte d'authentification est disponible à cette station de charge ?"
-            }
-        }
-    },
-    "binocular": {
-        "presets": {
-            "0": {
-                "description": "Une longue-vue ou une paire de jumelles montée sur un poteau, disponible au public pour scruter les environs.\n<img src='./assets/layers/binocular/binoculars_example.jpg' style='height: 300px; width: auto; display: block;' />"
-            }
-        }
-    },
-    "birdhide": {
-        "filter": {
-            "0": {
-                "options": {
-                    "0": {
-                        "question": "Accessible aux fauteuils roulants"
-                    }
-                }
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/gl.json b/langs/layers/gl.json
index 233a366cbc..80c79d80a0 100644
--- a/langs/layers/gl.json
+++ b/langs/layers/gl.json
@@ -396,13 +396,13 @@
     },
     "ghost_bike": {
         "name": "Bicicleta pantasma",
-        "title": {
-            "render": "Bicicleta pantasma"
-        },
         "presets": {
             "0": {
                 "title": "Bicicleta pantasma"
             }
+        },
+        "title": {
+            "render": "Bicicleta pantasma"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index aff529ba51..bd8bc37f7a 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -213,13 +213,13 @@
     },
     "ghost_bike": {
         "name": "Emlékkerékpár",
-        "title": {
-            "render": "Emlékkerékpár"
-        },
         "presets": {
             "0": {
                 "title": "Emlékkerékpár"
             }
+        },
+        "title": {
+            "render": "Emlékkerékpár"
         }
     },
     "shops": {
@@ -233,4 +233,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/ja.json b/langs/layers/ja.json
index 161302199f..252865edec 100644
--- a/langs/layers/ja.json
+++ b/langs/layers/ja.json
@@ -92,13 +92,13 @@
     },
     "ghost_bike": {
         "name": "ゴーストバイク",
-        "title": {
-            "render": "ゴーストバイク"
-        },
         "presets": {
             "0": {
                 "title": "ゴーストバイク"
             }
+        },
+        "title": {
+            "render": "ゴーストバイク"
         }
     },
     "shops": {
@@ -170,4 +170,4 @@
             "render": "店"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/nb_NO.json b/langs/layers/nb_NO.json
index 7ad7cc32e7..e9fa529cd9 100644
--- a/langs/layers/nb_NO.json
+++ b/langs/layers/nb_NO.json
@@ -176,13 +176,13 @@
     },
     "ghost_bike": {
         "name": "Spøkelsessykler",
-        "title": {
-            "render": "Spøkelsessykler"
-        },
         "presets": {
             "0": {
                 "title": "Spøkelsessykler"
             }
+        },
+        "title": {
+            "render": "Spøkelsessykler"
         }
     },
     "shops": {
@@ -196,4 +196,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
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": {
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index de07bc815b..141295585d 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -198,13 +198,13 @@
     },
     "ghost_bike": {
         "name": "Duch roweru",
-        "title": {
-            "render": "Duch roweru"
-        },
         "presets": {
             "0": {
                 "title": "Duch roweru"
             }
+        },
+        "title": {
+            "render": "Duch roweru"
         }
     },
     "shops": {
@@ -218,4 +218,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/pt.json b/langs/layers/pt.json
index df4d7e9753..022b6cf8ce 100644
--- a/langs/layers/pt.json
+++ b/langs/layers/pt.json
@@ -524,13 +524,13 @@
     },
     "ghost_bike": {
         "name": "Bicicleta fantasma",
-        "title": {
-            "render": "Bicicleta fantasma"
-        },
         "presets": {
             "0": {
                 "title": "Bicicleta fantasma"
             }
+        },
+        "title": {
+            "render": "Bicicleta fantasma"
         }
     },
     "shops": {
@@ -544,4 +544,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json
index eec42ea715..03d43821da 100644
--- a/langs/layers/pt_BR.json
+++ b/langs/layers/pt_BR.json
@@ -536,13 +536,13 @@
     },
     "ghost_bike": {
         "name": "Bicicleta fantasma",
-        "title": {
-            "render": "Bicicleta fantasma"
-        },
         "presets": {
             "0": {
                 "title": "Bicicleta fantasma"
             }
+        },
+        "title": {
+            "render": "Bicicleta fantasma"
         }
     },
     "shops": {
@@ -556,4 +556,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index aaec439e13..2373e2b2c5 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -746,6 +746,11 @@
     },
     "ghost_bike": {
         "name": "Велосипед ghost",
+        "presets": {
+            "0": {
+                "title": "Велосипед ghost"
+            }
+        },
         "tagRenderings": {
             "ghost_bike-inscription": {
                 "render": "<i>{inscription}</i>"
@@ -762,11 +767,6 @@
         },
         "title": {
             "render": "Велосипед Ghost"
-        },
-        "presets": {
-            "0": {
-                "title": "Велосипед ghost"
-            }
         }
     },
     "information_board": {
@@ -1411,4 +1411,4 @@
     "watermill": {
         "name": "Водяная мельница"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/sv.json b/langs/layers/sv.json
index b13c521154..607c2e040f 100644
--- a/langs/layers/sv.json
+++ b/langs/layers/sv.json
@@ -16,13 +16,13 @@
     },
     "ghost_bike": {
         "name": "Spökcykel",
-        "title": {
-            "render": "Spökcykel"
-        },
         "presets": {
             "0": {
                 "title": "Spökcykel"
             }
+        },
+        "title": {
+            "render": "Spökcykel"
         }
     },
     "shops": {
@@ -36,4 +36,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index 579a1c83cd..a5b4efd563 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -450,13 +450,13 @@
     },
     "ghost_bike": {
         "name": "幽靈單車",
-        "title": {
-            "render": "幽靈單車"
-        },
         "presets": {
             "0": {
                 "title": "幽靈單車"
             }
+        },
+        "title": {
+            "render": "幽靈單車"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/langs/shared-questions/fr.json b/langs/shared-questions/fr.json
index 3e1a17ed58..e0878286be 100644
--- a/langs/shared-questions/fr.json
+++ b/langs/shared-questions/fr.json
@@ -59,41 +59,6 @@
         "phone": {
             "question": "Quel est le numéro de téléphone de {name} ?"
         },
-        "website": {
-            "question": "Quel est le site web de {name} ?"
-        },
-        "wheelchair-access": {
-            "mappings": {
-              "1": {
-                "then": "Cet endroit est facilement accessible avec un fauteuil roulant"
-              },
-              "0": {
-                "then": "Cet endroit est spécialement adapté pour les usagers de fauteuils roulants"
-              },
-                "2": {
-                    "then": "Il est possible d'accéder à cet endroit en chaise roulante, mais ce n'est pas facile"
-                },
-                "3": {
-                    "then": "Cet endroit n'est pas accessible en chaise roulante"
-            },
-            "question": "Est-ce que cet endroit est accessible en chaise roulante ?"
-        }
-    },
-        "wikipedialink": {
-                "mappings": {
-                    "0": {
-                        "then": "Non lié avec Wikipedia"
-                    }
-                }
-            },
-        "wikipedia": {
-                "question": "Quelle est l'entité Wikidata correspondante ?",
-                "mappings": {
-                    "0": {
-                        "then": "Pas encore de lien vers une page Wikipedia"
-                    }
-                }
-            },
         "service:electricity": {
             "mappings": {
                 "2": {
@@ -103,6 +68,41 @@
                     "then": "Il n'y a pas de prises secteur disponibles pour les clients assis à l'intérieur"
                 }
             }
+        },
+        "website": {
+            "question": "Quel est le site web de {name} ?"
+        },
+        "wheelchair-access": {
+            "mappings": {
+                "0": {
+                    "then": "Cet endroit est spécialement adapté pour les usagers de fauteuils roulants"
+                },
+                "1": {
+                    "then": "Cet endroit est facilement accessible avec un fauteuil roulant"
+                },
+                "2": {
+                    "then": "Il est possible d'accéder à cet endroit en chaise roulante, mais ce n'est pas facile"
+                },
+                "3": {
+                    "then": "Cet endroit n'est pas accessible en chaise roulante"
+                }
+            },
+            "question": "Est-ce que cet endroit est accessible en chaise roulante ?"
+        },
+        "wikipedia": {
+            "mappings": {
+                "0": {
+                    "then": "Pas encore de lien vers une page Wikipedia"
+                }
+            },
+            "question": "Quelle est l'entité Wikidata correspondante ?"
+        },
+        "wikipedialink": {
+            "mappings": {
+                "0": {
+                    "then": "Non lié avec Wikipedia"
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/langs/shared-questions/pt.json b/langs/shared-questions/pt.json
index 30d76e7f7f..7a2669178b 100644
--- a/langs/shared-questions/pt.json
+++ b/langs/shared-questions/pt.json
@@ -59,6 +59,23 @@
         "phone": {
             "question": "Qual é o número de telefone de {name}?"
         },
+        "service:electricity": {
+            "mappings": {
+                "0": {
+                    "then": "Há muitas tomadas elétricas disponíveis para clientes sentados no interior, onde estes podem carregar os seus dispositivos eletrónicos"
+                },
+                "1": {
+                    "then": "Há algumas tomadas elétricas disponíveis para clientes sentados no interior, onde estes podem carregar os seus dispositivos eletrónicos"
+                },
+                "2": {
+                    "then": "Não há tomadas elétricas disponíveis para clientes sentados no interior, mas pode-se pedir aos funcionários para carregar dispositivos eletrónicos"
+                },
+                "3": {
+                    "then": "Não há tomadas elétricas disponíveis para clientes sentados no interior"
+                }
+            },
+            "question": "Esta infraestrutura tem tomadas elétricas, disponíveis para os clientes quando estão no interior?"
+        },
         "website": {
             "question": "Qual é o sítio web de {name}?"
         },
@@ -94,23 +111,6 @@
                 }
             },
             "question": "Qual é o item correspondente na Wikipédia?"
-        },
-        "service:electricity": {
-            "mappings": {
-                "0": {
-                    "then": "Há muitas tomadas elétricas disponíveis para clientes sentados no interior, onde estes podem carregar os seus dispositivos eletrónicos"
-                },
-                "1": {
-                    "then": "Há algumas tomadas elétricas disponíveis para clientes sentados no interior, onde estes podem carregar os seus dispositivos eletrónicos"
-                },
-                "2": {
-                    "then": "Não há tomadas elétricas disponíveis para clientes sentados no interior, mas pode-se pedir aos funcionários para carregar dispositivos eletrónicos"
-                },
-                "3": {
-                    "then": "Não há tomadas elétricas disponíveis para clientes sentados no interior"
-                }
-            },
-            "question": "Esta infraestrutura tem tomadas elétricas, disponíveis para os clientes quando estão no interior?"
         }
     }
-}
+}
\ No newline at end of file