Add bicycle_rental questions to bike shops

assets/layers/bicycle_rental/bicycle_rental.json

@@ -143,7 +143,9 @@
     },
     {
       "id": "bicycle-types",
-      "group": "bicycle_rental",
+      "labels": [
+        "bicycle_rental"
+      ],
       "question": {
         "en": "What kind of bicycles and accessories are rented here?",
         "nl": "Wat voor soort fietsen en fietstoebehren worden hier verhuurd?"
@@ -270,7 +272,9 @@
       "renderings": [
         {
           "id": "rental-capacity-bicycle-type",
-          "group": "bicycle_rental",
+          "labels": [
+            "bicycle_rental"
+          ],
           "question": {
             "en": "How much type_plural can be rented here? ",
             "nl": "Hoeveel type_plural kunnen hier uitgeleend worden?"

assets/layers/bike_shop/bike_shop.json

@@ -308,7 +308,6 @@
       "id": "bike_shop-email"
     },
     "opening_hours",
-    "description",
     {
       "render": {
         "en": "Only accessible to {access}",
@@ -436,6 +435,7 @@
       ]
     },
     {
+      "#": "Remark: we steal the 'bicycle_rental' questions from the other layer. They'll get the condition of their source automatically!",
       "id": "bike_repair_rents-bikes",
       "question": {
         "en": "Does this shop rent out bikes?",
@@ -479,6 +479,7 @@
         }
       ]
     },
+    "bicycle_rental.*bicycle_rental",
     {
       "id": "bike_repair_second-hand-bikes",
       "question": {
@@ -669,7 +670,8 @@
         }
       ]
     },
-    "bike_cleaning.bike_cleaning-service:bicycle:cleaning:charge"
+    "bike_cleaning.bike_cleaning-service:bicycle:cleaning:charge",
+    "description"
   ],
   "presets": [
     {