diff --git a/assets/layers/public_bookcase/public_bookcase.json b/assets/layers/public_bookcase/public_bookcase.json
index 5ae7c5927..e14685da0 100644
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@@ -130,10 +130,6 @@
       "condition": "ref=",
       "freeform": {
         "key": "brand",
-        "type": "nsi",
-        "helperArgs": [
-          "amenity=public_bookcase"
-        ],
         "placeholder": {
           "en": "Name of the network"
         },
@@ -629,4 +625,4 @@
     "neededChangesets": 5
   },
   "allowMove": true
-}
\ No newline at end of file
+}
diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index aaa1a7b9b..151ceeb36 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -282,6 +282,26 @@
         "invalidValues": "shop=yes"
       }
     },
+    {
+      "id": "brand",
+      "question": {
+        "en": "What is the brand of this shop?"
+      },
+      "render": {
+        "en": "Part of <b>{brand}</b>"
+      },
+      "freeform": {
+        "key":"brand"
+      },
+      "mappings": [
+        {
+          "if": "not:brand=yes",
+          "then": {
+            "en": "This shop does not have a specific brand, it is not part of a bigger chain"
+          }
+        }
+      ]
+    },
     {
       "id": "second_hand",
       "question": {