diff --git a/assets/layers/shops/shops.json b/assets/layers/shops/shops.json
index a5109f6b52..a8cf72c886 100644
--- a/assets/layers/shops/shops.json
+++ b/assets/layers/shops/shops.json
@@ -323,6 +323,7 @@
       }
     },
     {
+      "id": "diets",
       "builtin": [
         "sugar_free",
         "gluten_free",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 7e64b19c31..29c34397c4 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4724,6 +4724,27 @@
                         "question": "Offers electricity"
                     }
                 }
+            },
+            "13": {
+                "options": {
+                    "0": {
+                        "question": "Has a sugar-free offering"
+                    }
+                }
+            },
+            "14": {
+                "options": {
+                    "0": {
+                        "question": "Has a gluten free offering"
+                    }
+                }
+            },
+            "15": {
+                "options": {
+                    "0": {
+                        "question": "Has a lactose free offering"
+                    }
+                }
             }
         }
     },
@@ -7499,6 +7520,23 @@
             "email": {
                 "question": "What is the email address of {title()}?"
             },
+            "gluten_free": {
+                "mappings": {
+                    "0": {
+                        "then": "This shop <b>only sells gluten free</b> products"
+                    },
+                    "1": {
+                        "then": "This shop has a big gluten free offering"
+                    },
+                    "2": {
+                        "then": "This shop has a <b>limited gluten free</b> offering"
+                    },
+                    "3": {
+                        "then": "This shop has no gluten free offering"
+                    }
+                },
+                "question": "Does this shop have a gluten free offering?"
+            },
             "induction-loop": {
                 "mappings": {
                     "0": {
@@ -7558,6 +7596,23 @@
                     }
                 }
             },
+            "lactose_free": {
+                "mappings": {
+                    "0": {
+                        "then": "<b>Only sells lactose free</b> products"
+                    },
+                    "1": {
+                        "then": "Big lactose free offering"
+                    },
+                    "2": {
+                        "then": "<b>Limited lactose free</b> offering"
+                    },
+                    "3": {
+                        "then": "No lactose free offering"
+                    }
+                },
+                "question": "Does {title()} have a lactose-free offering?"
+            },
             "last_edit": {
                 "render": {
                     "special": {
@@ -7718,6 +7773,24 @@
                 },
                 "question": "Is smoking allowed at {title()}?"
             },
+            "sugar_free": {
+                "mappings": {
+                    "0": {
+                        "then": "This shop <b>only sells sugar free</b> products"
+                    },
+                    "1": {
+                        "then": "This shop has a big sugar free offering"
+                    },
+                    "2": {
+                        "then": "This shop has a <b>limited sugar free</b> offering"
+                    },
+                    "3": {
+                        "then": "This shop has no sugar free offering"
+                    }
+                },
+                "question": "Does this shop have a sugar free offering?",
+                "questionHint": "This is important for people following a sugar-free diet, such as people with Diabetes"
+            },
             "survey_date": {
                 "mappings": {
                     "0": {
@@ -8262,6 +8335,13 @@
                         "question": "Only show shops with name {search}"
                     }
                 }
+            },
+            "6": {
+                "options": {
+                    "0": {
+                        "question": "Only show shops selling second-hand items"
+                    }
+                }
             }
         },
         "name": "Shop",
@@ -8312,6 +8392,9 @@
                 },
                 "question": "Does this shop offer organic products?"
             },
+            "second_hand": {
+                "question": "Does this shop sell second-hand items?"
+            },
             "shops-name": {
                 "question": "What is the name of this shop?",
                 "render": "This shop is called <i>{name}</i>"