diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 72025489a..4b10010cf 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -396,32 +396,17 @@
       },
       "condition": "ref=",
       "freeform": {
-        "key": "brand"
+        "key": "brand",
+        "type": "nsi",
+        "helperArgs": [
+          "amenity=public_bookcase",
+          "nobrand="
+        ],
+        "placeholder": {
+          "en": "Name of the network"
+        }
       },
       "mappings": [
-        {
-          "then": {
-            "en": "Part of the network 'Little Free Library'",
-            "nl": "Deel van het netwerk 'Little Free Library'",
-            "de": "Der Bücherschrank gehört zum Netzwerk 'Little Free Library'",
-            "fr": "Fait partie du réseau Little Free Library",
-            "it": "Fa parte della rete 'Little Free Library'",
-            "hu": "A „Little Free Library” hálózat része",
-            "es": "Parte de la red 'Little Free Library'",
-            "pl": "Część sieci \"Little Free Library\"",
-            "ca": "Part de la xarxa 'Little Free Library'",
-            "cs": "Součást sítě 'Little Free Library'"
-          },
-          "if": {
-            "and": [
-              "brand=Little Free Library",
-              "nobrand="
-            ]
-          },
-          "addExtraTags": [
-            "brand:wikidata=Q6650101"
-          ]
-        },
         {
           "if": {
             "and": [
@@ -438,7 +423,10 @@
             "hu": "Ez a nyilvános könyvespolc nem része egy nagyobb hálózatnak",
             "ca": "Aquesta prestatgeria pública no és part d'una xarxa més gran",
             "cs": "Tato veřejná knihobudka není součástí větší sítě"
-          }
+          },
+          "addExtraTags": [
+            "brand:wikidata="
+          ]
         }
       ],
       "id": "public_bookcase-brand"
@@ -639,4 +627,4 @@
     "neededChangesets": 5
   },
   "allowMove": true
-}
+}
\ No newline at end of file
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index 097b5b190..3d292c523 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -6032,9 +6032,6 @@
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
-                        "then": "Part de la xarxa 'Little Free Library'"
-                    },
-                    "1": {
                         "then": "Aquesta prestatgeria pública no és part d'una xarxa més gran"
                     }
                 },
diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index bb687b704..7520ac119 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -6263,9 +6263,6 @@
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
-                        "then": "Součást sítě 'Little Free Library'"
-                    },
-                    "1": {
                         "then": "Tato veřejná knihobudka není součástí větší sítě"
                     }
                 },
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 91a6fa0eb..516d5f795 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -2166,7 +2166,7 @@
                 "title": "Ladestation für Elektrofahrräder"
             },
             "1": {
-                "title": "Ladestation für Elektrofahrräder"
+                "title": "Ladestation für Autos"
             }
         },
         "tagRenderings": {
@@ -7467,9 +7467,6 @@
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
-                        "then": "Der Bücherschrank gehört zum Netzwerk 'Little Free Library'"
-                    },
-                    "1": {
                         "then": "Der Bücherschrank gehört zu keinem Netzwerk"
                     }
                 },
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 7d1e5626e..b6cc7721d 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1495,6 +1495,11 @@
                 },
                 "question": "What is the relative location of this bicycle parking?"
             },
+            "charge": {
+                "question": "How much does it cost to park your bike here?",
+                "questionHint": "This is the amount which is charged for a single bike",
+                "render": "Parking your bike costs {charge}"
+            },
             "fee": {
                 "mappings": {
                     "0": {
@@ -7590,11 +7595,11 @@
                 "question": "Is this bookcase located outdoors?"
             },
             "public_bookcase-brand": {
+                "freeform": {
+                    "placeholder": "Name of the network"
+                },
                 "mappings": {
                     "0": {
-                        "then": "Part of the network 'Little Free Library'"
-                    },
-                    "1": {
                         "then": "This public bookcase is not part of a bigger network"
                     }
                 },
@@ -10651,6 +10656,10 @@
                     "4": {
                         "human": "{quantity} months",
                         "humanSingular": "one month"
+                    },
+                    "5": {
+                        "human": "{quantity} years",
+                        "humanSingular": "one year"
                     }
                 }
             }
diff --git a/langs/layers/es.json b/langs/layers/es.json
index d2fc81df3..6c5ca26d0 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -3448,13 +3448,6 @@
                         "then": "Solo accesible a clientes"
                     }
                 }
-            },
-            "public_bookcase-brand": {
-                "mappings": {
-                    "0": {
-                        "then": "Parte de la red 'Little Free Library'"
-                    }
-                }
             }
         }
     },
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index ff83416f6..15376afef 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -595,6 +595,9 @@
                     },
                     "1": {
                         "then": "Ce banc n'a pas d'oeuvre d'art intégrée"
+                    },
+                    "2": {
+                        "then": "Ce banc ne comporte <span class=\"subtle\">probablement</span> pas d'œuvre d'art"
                     }
                 },
                 "question": "Est-ce que ce banc inclut un élément artistique ?",
@@ -654,7 +657,7 @@
                         "then": "Ce banc n'a pas d'inscription"
                     },
                     "1": {
-                        "then": "Ce banc n'a<span class='subtle'>(probablement)</span> pas d'inscription"
+                        "then": "Ce banc n'a <span class='subtle'>(probablement)</span> pas d'inscription"
                     }
                 },
                 "question": "Est-ce que ce banc possède une inscription ?",
@@ -2960,6 +2963,13 @@
                 "question": "Quelle est la profondeur de cet ascenseur ?",
                 "render": "Cet ascenseur a une profondeur de {canonical(length)}"
             },
+            "elevator-shape": {
+                "mappings": {
+                    "0": {
+                        "then": "Cet ascenseur est de forme rectangulaire"
+                    }
+                }
+            },
             "elevator-width": {
                 "question": "Quelle est la largeur de cet ascenseur ?",
                 "render": "Cet ascenseur a une largeur de {canonical(width)}"
@@ -4502,9 +4512,6 @@
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
-                        "then": "Fait partie du réseau Little Free Library"
-                    },
-                    "1": {
                         "then": "Cette microbibliothèque ne fait pas partie d'un réseau/groupe"
                     }
                 },
diff --git a/langs/layers/hu.json b/langs/layers/hu.json
index 92a8b9157..7fb5b34de 100644
--- a/langs/layers/hu.json
+++ b/langs/layers/hu.json
@@ -712,9 +712,6 @@
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
-                        "then": "A „Little Free Library” hálózat része"
-                    },
-                    "1": {
                         "then": "Ez a nyilvános könyvespolc nem része egy nagyobb hálózatnak"
                     }
                 },
diff --git a/langs/layers/it.json b/langs/layers/it.json
index b57b1ae26..830d2d273 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -1967,9 +1967,6 @@
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
-                        "then": "Fa parte della rete 'Little Free Library'"
-                    },
-                    "1": {
                         "then": "Questa microbiblioteca non fa parte di una rete"
                     }
                 },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 21720c549..fa74d157e 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1211,6 +1211,11 @@
                 },
                 "question": "Wat is de relatieve locatie van deze parking??"
             },
+            "charge": {
+                "question": "Hoeveel kost het om een fiets te stallen?",
+                "questionHint": "Dit is de kostprijs voor een enkele fiets",
+                "render": "Je fiets hier parkeren kost {charge}"
+            },
             "fee": {
                 "mappings": {
                     "0": {
@@ -6310,9 +6315,6 @@
             "public_bookcase-brand": {
                 "mappings": {
                     "0": {
-                        "then": "Deel van het netwerk 'Little Free Library'"
-                    },
-                    "1": {
                         "then": "Dit boekenruilkastje maakt geen deel uit van een netwerk"
                     }
                 },
@@ -8710,6 +8712,10 @@
                     "4": {
                         "human": "{quantity} maanden",
                         "humanSingular": "één maand"
+                    },
+                    "5": {
+                        "human": "{quantity} jaar",
+                        "humanSingular": "één jaar"
                     }
                 }
             }
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index 90a2a1cd7..30dba7181 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -2234,17 +2234,6 @@
             }
         }
     },
-    "public_bookcase": {
-        "tagRenderings": {
-            "public_bookcase-brand": {
-                "mappings": {
-                    "0": {
-                        "then": "Część sieci \"Little Free Library\""
-                    }
-                }
-            }
-        }
-    },
     "questions": {
         "tagRenderings": {
             "check_date": {
diff --git a/src/UI/InputElement/Helpers/NameSuggestionIndexInput.svelte b/src/UI/InputElement/Helpers/NameSuggestionIndexInput.svelte
index fe9e2dca4..7909960f6 100644
--- a/src/UI/InputElement/Helpers/NameSuggestionIndexInput.svelte
+++ b/src/UI/InputElement/Helpers/NameSuggestionIndexInput.svelte
@@ -23,6 +23,7 @@
 
   let maintag = helperArgs[0].toString()
   let tag = key
+  let addExtraTags = helperArgs[1].split(";")
 
   const path = `${tag}s/${maintag.split("=")[0]}/${maintag.split("=")[1]}`
 
@@ -132,6 +133,11 @@
       })
     }
 
+    // If we have layer-defined extra tags, also add them
+    addExtraTags.forEach((extraTag) => {
+      tags[extraTag.split("=")[0]] = extraTag.split("=")[1]
+    })
+
     // Finally, set the extra tags
     extraTags.setData(tags)
   }
diff --git a/src/UI/InputElement/Validators/NameSuggestionIndexValidator.ts b/src/UI/InputElement/Validators/NameSuggestionIndexValidator.ts
index 09625378d..fdf09ea45 100644
--- a/src/UI/InputElement/Validators/NameSuggestionIndexValidator.ts
+++ b/src/UI/InputElement/Validators/NameSuggestionIndexValidator.ts
@@ -24,6 +24,10 @@ export default class NameSuggestionIndexValidator extends Validator {
                                             "main",
                                             "The main tag to give suggestions for, e.g. `amenity=restaurant`.",
                                         ],
+                                        [
+                                            "addExtraTags",
+                                            "Extra tags to add to the suggestions, e.g. `nobrand=yes`.",
+                                        ],
                                     ]
                                 ),
                             ]),