diff --git a/langs/layers/en.json b/langs/layers/en.json
index 6ba6930a2..b97280814 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -35,6 +35,16 @@
             "1": {
                 "title": "a freestanding poster box"
             },
+            "10": {
+                "description": "Used for advertising signs, neon signs, logos & institutional entrance signs",
+                "title": "a sign"
+            },
+            "11": {
+                "title": "a sculpture"
+            },
+            "12": {
+                "title": "a wall painting"
+            },
             "2": {
                 "title": "a poster box mounted on a wall"
             },
@@ -61,16 +71,6 @@
             },
             "9": {
                 "title": "a totem"
-            },
-            "10": {
-                "description": "Used for advertising signs, neon signs, logos & institutional entrance signs",
-                "title": "a sign"
-            },
-            "11": {
-                "title": "a sculpture"
-            },
-            "12": {
-                "title": "a wall painting"
             }
         },
         "tagRenderings": {
@@ -165,6 +165,9 @@
                     "1": {
                         "then": "This is a board"
                     },
+                    "10": {
+                        "then": "This is a wall painting"
+                    },
                     "2": {
                         "then": "This is a column"
                     },
@@ -188,9 +191,6 @@
                     },
                     "9": {
                         "then": "This is a totem"
-                    },
-                    "10": {
-                        "then": "This is a wall painting"
                     }
                 },
                 "question": "Which type of advertising feature is this?",
@@ -205,6 +205,9 @@
                 "1": {
                     "then": "Board"
                 },
+                "10": {
+                    "then": "Wall painting"
+                },
                 "2": {
                     "then": "Poster Box"
                 },
@@ -228,9 +231,6 @@
                 },
                 "9": {
                     "then": "Totem"
-                },
-                "10": {
-                    "then": "Wall painting"
                 }
             }
         }
@@ -312,6 +312,15 @@
                     "1": {
                         "then": "Mural"
                     },
+                    "10": {
+                        "then": "Azulejo (Spanish decorative tilework)"
+                    },
+                    "11": {
+                        "then": "Tilework"
+                    },
+                    "12": {
+                        "then": "Woodcarving"
+                    },
                     "2": {
                         "then": "Painting"
                     },
@@ -335,15 +344,6 @@
                     },
                     "9": {
                         "then": "Relief"
-                    },
-                    "10": {
-                        "then": "Azulejo (Spanish decorative tilework)"
-                    },
-                    "11": {
-                        "then": "Tilework"
-                    },
-                    "12": {
-                        "then": "Woodcarving"
                     }
                 },
                 "question": "What is the type of this artwork?",
@@ -1892,6 +1892,27 @@
                     "1": {
                         "question": "Has a <div style='display: inline-block'><b><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/CEE7_4F.svg'/></div> connector"
                     },
+                    "10": {
+                        "question": "Has a <div style='display: inline-block'><b><b>Type 2 with cable</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> connector"
+                    },
+                    "11": {
+                        "question": "Has a <div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (a branded type2_css)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> connector"
+                    },
+                    "12": {
+                        "question": "Has a <div style='display: inline-block'><b><b>Tesla Supercharger (destination)</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div> connector"
+                    },
+                    "13": {
+                        "question": "Has a <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> connector"
+                    },
+                    "14": {
+                        "question": "Has a <div style='display: inline-block'><b><b>USB</b> to charge phones and small electronics</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/usb_port.svg'/></div> connector"
+                    },
+                    "15": {
+                        "question": "Has a <div style='display: inline-block'><b><b>Bosch Active Connect with 3 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-3pin.svg'/></div> connector"
+                    },
+                    "16": {
+                        "question": "Has a <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> connector"
+                    },
                     "2": {
                         "question": "Has a <div style='display: inline-block'><b><b>European wall plug</b> with ground pin (CEE7/4 type E)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/TypeE.svg'/></div> connector"
                     },
@@ -1915,27 +1936,6 @@
                     },
                     "9": {
                         "question": "Has a <div style='display: inline-block'><b><b>Type 2 CCS</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> connector"
-                    },
-                    "10": {
-                        "question": "Has a <div style='display: inline-block'><b><b>Type 2 with cable</b> (mennekes)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> connector"
-                    },
-                    "11": {
-                        "question": "Has a <div style='display: inline-block'><b><b>Tesla Supercharger CCS</b> (a branded type2_css)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_CCS.svg'/></div> connector"
-                    },
-                    "12": {
-                        "question": "Has a <div style='display: inline-block'><b><b>Tesla Supercharger (destination)</b></b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/></div> connector"
-                    },
-                    "13": {
-                        "question": "Has a <div style='display: inline-block'><b><b>Tesla Supercharger (Destination)</b> (A Type 2 with cable branded as tesla)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/Type2_tethered.svg'/></div> connector"
-                    },
-                    "14": {
-                        "question": "Has a <div style='display: inline-block'><b><b>USB</b> to charge phones and small electronics</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/usb_port.svg'/></div> connector"
-                    },
-                    "15": {
-                        "question": "Has a <div style='display: inline-block'><b><b>Bosch Active Connect with 3 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-3pin.svg'/></div> connector"
-                    },
-                    "16": {
-                        "question": "Has a <div style='display: inline-block'><b><b>Bosch Active Connect with 5 pins</b> and cable</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bosch-5pin.svg'/></div> connector"
                     }
                 }
             }
@@ -1991,30 +1991,6 @@
                     "1": {
                         "then": "<b>Schuko wall plug</b> without ground pin (CEE7/4 type F)"
                     },
-                    "2": {
-                        "then": "<b>European wall plug</b> with ground pin (CEE7/4 type E)"
-                    },
-                    "3": {
-                        "then": "<b>European wall plug</b> with ground pin (CEE7/4 type E)"
-                    },
-                    "4": {
-                        "then": "<b>Chademo</b>"
-                    },
-                    "5": {
-                        "then": "<b>Chademo</b>"
-                    },
-                    "6": {
-                        "then": "<b>Type 1 with cable</b> (J1772)"
-                    },
-                    "7": {
-                        "then": "<b>Type 1 with cable</b> (J1772)"
-                    },
-                    "8": {
-                        "then": "<b>Type 1 <i>without</i> cable</b> (J1772)"
-                    },
-                    "9": {
-                        "then": "<b>Type 1 <i>without</i> cable</b> (J1772)"
-                    },
                     "10": {
                         "then": "<b>Type 1 CCS</b> (aka Type 1 Combo)"
                     },
@@ -2045,6 +2021,9 @@
                     "19": {
                         "then": "<b>Type 2 with cable</b> (mennekes)"
                     },
+                    "2": {
+                        "then": "<b>European wall plug</b> with ground pin (CEE7/4 type E)"
+                    },
                     "20": {
                         "then": "<b>Tesla Supercharger CCS</b> (a branded type2_css)"
                     },
@@ -2075,11 +2054,32 @@
                     "29": {
                         "then": "<b>Bosch Active Connect with 3 pins</b> and cable"
                     },
+                    "3": {
+                        "then": "<b>European wall plug</b> with ground pin (CEE7/4 type E)"
+                    },
                     "30": {
                         "then": "<b>Bosch Active Connect with 5 pins</b> and cable"
                     },
                     "31": {
                         "then": "<b>Bosch Active Connect with 5 pins</b> and cable"
+                    },
+                    "4": {
+                        "then": "<b>Chademo</b>"
+                    },
+                    "5": {
+                        "then": "<b>Chademo</b>"
+                    },
+                    "6": {
+                        "then": "<b>Type 1 with cable</b> (J1772)"
+                    },
+                    "7": {
+                        "then": "<b>Type 1 with cable</b> (J1772)"
+                    },
+                    "8": {
+                        "then": "<b>Type 1 <i>without</i> cable</b> (J1772)"
+                    },
+                    "9": {
+                        "then": "<b>Type 1 <i>without</i> cable</b> (J1772)"
                     }
                 },
                 "question": "Which charging connections are available here?"
@@ -3617,6 +3617,15 @@
                     "1": {
                         "then": "This cycleway is paved"
                     },
+                    "10": {
+                        "then": "This cycleway is made of fine gravel"
+                    },
+                    "11": {
+                        "then": "This cycleway is made of pebblestone"
+                    },
+                    "12": {
+                        "then": "This cycleway is made from raw ground"
+                    },
                     "2": {
                         "then": "This cycleway is made of asphalt"
                     },
@@ -3640,15 +3649,6 @@
                     },
                     "9": {
                         "then": "This cycleway is made of gravel"
-                    },
-                    "10": {
-                        "then": "This cycleway is made of fine gravel"
-                    },
-                    "11": {
-                        "then": "This cycleway is made of pebblestone"
-                    },
-                    "12": {
-                        "then": "This cycleway is made from raw ground"
                     }
                 },
                 "question": "What is the surface of the cycleway made from?",
@@ -3697,6 +3697,15 @@
                     "1": {
                         "then": "This cycleway is paved"
                     },
+                    "10": {
+                        "then": "This cycleway is made of fine gravel"
+                    },
+                    "11": {
+                        "then": "This cycleway is made of pebblestone"
+                    },
+                    "12": {
+                        "then": "This cycleway is made from raw ground"
+                    },
                     "2": {
                         "then": "This cycleway is made of asphalt"
                     },
@@ -3720,15 +3729,6 @@
                     },
                     "9": {
                         "then": "This cycleway is made of gravel"
-                    },
-                    "10": {
-                        "then": "This cycleway is made of fine gravel"
-                    },
-                    "11": {
-                        "then": "This cycleway is made of pebblestone"
-                    },
-                    "12": {
-                        "then": "This cycleway is made from raw ground"
                     }
                 },
                 "question": "What is the surface of the street made from?",
@@ -4627,6 +4627,19 @@
                     }
                 }
             },
+            "10": {
+                "options": {
+                    "0": {
+                        "question": "No preference towards dogs"
+                    },
+                    "1": {
+                        "question": "Dogs allowed"
+                    },
+                    "2": {
+                        "question": "No dogs allowed"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {
@@ -4697,19 +4710,6 @@
                         "question": "Free to use"
                     }
                 }
-            },
-            "10": {
-                "options": {
-                    "0": {
-                        "question": "No preference towards dogs"
-                    },
-                    "1": {
-                        "question": "Dogs allowed"
-                    },
-                    "2": {
-                        "question": "No dogs allowed"
-                    }
-                }
             }
         }
     },
@@ -4829,30 +4829,6 @@
                     "1": {
                         "then": "This fitness station has a sign with instructions for a specific exercise."
                     },
-                    "2": {
-                        "then": "This fitness station has a facility for sit-ups."
-                    },
-                    "3": {
-                        "then": "This fitness station has a facility for push-ups. Usually consists of one or more low horizontal bars."
-                    },
-                    "4": {
-                        "then": "This fitness station has bars for stretching."
-                    },
-                    "5": {
-                        "then": "This fitness station has a station for making hyperextensions."
-                    },
-                    "6": {
-                        "then": "This fitness station has rings for gymnastic exercises."
-                    },
-                    "7": {
-                        "then": "This fitness station has a horizontal ladder, also known as monkey bars."
-                    },
-                    "8": {
-                        "then": "This fitness station has wall bars to climb on."
-                    },
-                    "9": {
-                        "then": "This fitness station has posts for performing slalom exercises."
-                    },
                     "10": {
                         "then": "This fitness station has stepping stones."
                     },
@@ -4883,6 +4859,9 @@
                     "19": {
                         "then": "This fitness station has battling ropes."
                     },
+                    "2": {
+                        "then": "This fitness station has a facility for sit-ups."
+                    },
                     "20": {
                         "then": "This fitness station has a stationary bicycle."
                     },
@@ -4897,6 +4876,27 @@
                     },
                     "24": {
                         "then": "This fitness station has a slackline."
+                    },
+                    "3": {
+                        "then": "This fitness station has a facility for push-ups. Usually consists of one or more low horizontal bars."
+                    },
+                    "4": {
+                        "then": "This fitness station has bars for stretching."
+                    },
+                    "5": {
+                        "then": "This fitness station has a station for making hyperextensions."
+                    },
+                    "6": {
+                        "then": "This fitness station has rings for gymnastic exercises."
+                    },
+                    "7": {
+                        "then": "This fitness station has a horizontal ladder, also known as monkey bars."
+                    },
+                    "8": {
+                        "then": "This fitness station has wall bars to climb on."
+                    },
+                    "9": {
+                        "then": "This fitness station has posts for performing slalom exercises."
                     }
                 },
                 "question": "What kind of equipment does this fitness station have?"
@@ -5003,7 +5003,7 @@
                 "title": "a fastfood"
             },
             "2": {
-                "description": "A fastfood-business focused on french fries",
+                "description": "A fast-food business focused on french fries",
                 "title": "a fries shop"
             }
         },
@@ -5016,30 +5016,6 @@
                     "1": {
                         "then": "This is a friture"
                     },
-                    "2": {
-                        "then": "Mainly serves pasta"
-                    },
-                    "3": {
-                        "then": "This is kebab shop"
-                    },
-                    "4": {
-                        "then": "This is a sandwichbar"
-                    },
-                    "5": {
-                        "then": "Burgers are served here"
-                    },
-                    "6": {
-                        "then": "Sushi is served here"
-                    },
-                    "7": {
-                        "then": "Coffee is served here"
-                    },
-                    "8": {
-                        "then": "This is an italian restaurant (which serves more then pasta and pizza)"
-                    },
-                    "9": {
-                        "then": "French dishes are served here"
-                    },
                     "10": {
                         "then": "Chinese dishes are served here"
                     },
@@ -5054,15 +5030,39 @@
                     },
                     "14": {
                         "then": "Thai dishes are served here"
+                    },
+                    "2": {
+                        "then": "Mainly serves pasta"
+                    },
+                    "3": {
+                        "then": "This is kebab shop"
+                    },
+                    "4": {
+                        "then": "This is a sandwich shop"
+                    },
+                    "5": {
+                        "then": "Burgers are served here"
+                    },
+                    "6": {
+                        "then": "Sushi is served here"
+                    },
+                    "7": {
+                        "then": "Coffee is served here"
+                    },
+                    "8": {
+                        "then": "This is an Italian restaurant (which serves more than pasta and pizza)"
+                    },
+                    "9": {
+                        "then": "French dishes are served here"
                     }
                 },
-                "question": "Which food is served here?",
+                "question": "What kind of food is served here?",
                 "render": "This place mostly serves {cuisine}"
             },
             "Fastfood vs restaurant": {
                 "mappings": {
                     "0": {
-                        "then": "This is a fastfood-business, focused on fast service. If seating is available, these are rather limited and functional."
+                        "then": "This is a fast-food business, focused on fast service. If seating is available, it is rather limited and functional."
                     },
                     "1": {
                         "then": "A <b>restaurant</b>, focused on creating a nice experience where one is served at the table"
@@ -5148,7 +5148,7 @@
                         "then": "This business does not deliver at home"
                     }
                 },
-                "question": "Delivers {title()} their food at home?"
+                "question": "Does {title()} deliver food to your home?"
             },
             "friture-oil": {
                 "mappings": {
@@ -5634,30 +5634,6 @@
                     "1": {
                         "then": "This is a auditorium"
                     },
-                    "2": {
-                        "then": "This is a bedroom"
-                    },
-                    "3": {
-                        "then": "This is a chapel"
-                    },
-                    "4": {
-                        "then": "This is a classroom"
-                    },
-                    "5": {
-                        "then": "This is a classroom"
-                    },
-                    "6": {
-                        "then": "This is a computer room"
-                    },
-                    "7": {
-                        "then": "This is a conference room"
-                    },
-                    "8": {
-                        "then": "This is a crypt"
-                    },
-                    "9": {
-                        "then": "This is a kitchen"
-                    },
                     "10": {
                         "then": "This is a laboratory"
                     },
@@ -5688,6 +5664,9 @@
                     "19": {
                         "then": "This is a storage room"
                     },
+                    "2": {
+                        "then": "This is a bedroom"
+                    },
                     "20": {
                         "then": "This is a technical room"
                     },
@@ -5696,6 +5675,27 @@
                     },
                     "22": {
                         "then": "This is a waiting room"
+                    },
+                    "3": {
+                        "then": "This is a chapel"
+                    },
+                    "4": {
+                        "then": "This is a classroom"
+                    },
+                    "5": {
+                        "then": "This is a classroom"
+                    },
+                    "6": {
+                        "then": "This is a computer room"
+                    },
+                    "7": {
+                        "then": "This is a conference room"
+                    },
+                    "8": {
+                        "then": "This is a crypt"
+                    },
+                    "9": {
+                        "then": "This is a kitchen"
                     }
                 },
                 "question": "What type of room is this?"
@@ -6350,6 +6350,19 @@
                     }
                 }
             },
+            "10": {
+                "options": {
+                    "0": {
+                        "question": "All Notes"
+                    },
+                    "1": {
+                        "question": "Hide import notes"
+                    },
+                    "2": {
+                        "question": "Show only import Notes"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {
@@ -6405,19 +6418,6 @@
                         "question": "Only show open notes"
                     }
                 }
-            },
-            "10": {
-                "options": {
-                    "0": {
-                        "question": "All Notes"
-                    },
-                    "1": {
-                        "question": "Hide import notes"
-                    },
-                    "2": {
-                        "question": "Show only import Notes"
-                    }
-                }
             }
         },
         "name": "OpenStreetMap notes",
@@ -6746,6 +6746,21 @@
                     "1": {
                         "then": "This is a normal parking space."
                     },
+                    "10": {
+                        "then": "This is a parking space reserved for parents with children."
+                    },
+                    "11": {
+                        "then": "This is a parking space reserved for staff."
+                    },
+                    "12": {
+                        "then": "This is a parking space reserved for taxis."
+                    },
+                    "13": {
+                        "then": "This is a parking space reserved for vehicles towing a trailer."
+                    },
+                    "14": {
+                        "then": "This is a parking space reserved for car sharing."
+                    },
                     "2": {
                         "then": "This is a disabled parking space."
                     },
@@ -6769,21 +6784,6 @@
                     },
                     "9": {
                         "then": "This is parking space reserved for motorcycles."
-                    },
-                    "10": {
-                        "then": "This is a parking space reserved for parents with children."
-                    },
-                    "11": {
-                        "then": "This is a parking space reserved for staff."
-                    },
-                    "12": {
-                        "then": "This is a parking space reserved for taxis."
-                    },
-                    "13": {
-                        "then": "This is a parking space reserved for vehicles towing a trailer."
-                    },
-                    "14": {
-                        "then": "This is a parking space reserved for car sharing."
                     }
                 },
                 "question": "What kind of parking space is this?"
@@ -7375,6 +7375,21 @@
                     "1": {
                         "then": "2 cent coins are accepted"
                     },
+                    "10": {
+                        "then": "20 centimes coins are accepted"
+                    },
+                    "11": {
+                        "then": "½ franc coins are accepted"
+                    },
+                    "12": {
+                        "then": "1 franc coins are accepted"
+                    },
+                    "13": {
+                        "then": "2 francs coins are accepted"
+                    },
+                    "14": {
+                        "then": "5 francs coins are accepted"
+                    },
                     "2": {
                         "then": "5 cent coins are accepted"
                     },
@@ -7398,21 +7413,6 @@
                     },
                     "9": {
                         "then": "10 centimes coins are accepted"
-                    },
-                    "10": {
-                        "then": "20 centimes coins are accepted"
-                    },
-                    "11": {
-                        "then": "½ franc coins are accepted"
-                    },
-                    "12": {
-                        "then": "1 franc coins are accepted"
-                    },
-                    "13": {
-                        "then": "2 francs coins are accepted"
-                    },
-                    "14": {
-                        "then": "5 francs coins are accepted"
                     }
                 },
                 "question": "What coins can you use to pay here?"
@@ -7425,6 +7425,15 @@
                     "1": {
                         "then": "10 euro notes are accepted"
                     },
+                    "10": {
+                        "then": "100 francs notes are accepted"
+                    },
+                    "11": {
+                        "then": "200 francs notes are accepted"
+                    },
+                    "12": {
+                        "then": "1000 francs notes are accepted"
+                    },
                     "2": {
                         "then": "20 euro notes are accepted"
                     },
@@ -7448,15 +7457,6 @@
                     },
                     "9": {
                         "then": "50 francs notes are accepted"
-                    },
-                    "10": {
-                        "then": "100 francs notes are accepted"
-                    },
-                    "11": {
-                        "then": "200 francs notes are accepted"
-                    },
-                    "12": {
-                        "then": "1000 francs notes are accepted"
                     }
                 },
                 "question": "what notes can you use to pay here?"
@@ -7838,30 +7838,6 @@
                     "1": {
                         "question": "Recycling of batteries"
                     },
-                    "2": {
-                        "question": "Recycling of beverage cartons"
-                    },
-                    "3": {
-                        "question": "Recycling of cans"
-                    },
-                    "4": {
-                        "question": "Recycling of clothes"
-                    },
-                    "5": {
-                        "question": "Recycling of cooking oil"
-                    },
-                    "6": {
-                        "question": "Recycling of engine oil"
-                    },
-                    "7": {
-                        "question": "Recycling of fluorescent tubes"
-                    },
-                    "8": {
-                        "question": "Recycling of green waste"
-                    },
-                    "9": {
-                        "question": "Recycling of glass bottles"
-                    },
                     "10": {
                         "question": "Recycling of glass"
                     },
@@ -7892,11 +7868,35 @@
                     "19": {
                         "question": "Recycling of residual waste"
                     },
+                    "2": {
+                        "question": "Recycling of beverage cartons"
+                    },
                     "20": {
                         "question": "Recycling of printer cartridges"
                     },
                     "21": {
                         "question": "Recycling of bicycles"
+                    },
+                    "3": {
+                        "question": "Recycling of cans"
+                    },
+                    "4": {
+                        "question": "Recycling of clothes"
+                    },
+                    "5": {
+                        "question": "Recycling of cooking oil"
+                    },
+                    "6": {
+                        "question": "Recycling of engine oil"
+                    },
+                    "7": {
+                        "question": "Recycling of fluorescent tubes"
+                    },
+                    "8": {
+                        "question": "Recycling of green waste"
+                    },
+                    "9": {
+                        "question": "Recycling of glass bottles"
                     }
                 }
             },
@@ -7964,30 +7964,6 @@
                     "1": {
                         "then": "Beverage cartons can be recycled here"
                     },
-                    "2": {
-                        "then": "Cans can be recycled here"
-                    },
-                    "3": {
-                        "then": "Clothes can be recycled here"
-                    },
-                    "4": {
-                        "then": "Cooking oil can be recycled here"
-                    },
-                    "5": {
-                        "then": "Engine oil can be recycled here"
-                    },
-                    "6": {
-                        "then": "Fluorescent tubes can be recycled here"
-                    },
-                    "7": {
-                        "then": "Green waste can be recycled here"
-                    },
-                    "8": {
-                        "then": "Organic waste can be recycled here"
-                    },
-                    "9": {
-                        "then": "Glass bottles can be recycled here"
-                    },
                     "10": {
                         "then": "Glass can be recycled here"
                     },
@@ -8018,6 +7994,9 @@
                     "19": {
                         "then": "Shoes can be recycled here"
                     },
+                    "2": {
+                        "then": "Cans can be recycled here"
+                    },
                     "20": {
                         "then": "Small electrical appliances can be recycled here"
                     },
@@ -8032,6 +8011,27 @@
                     },
                     "24": {
                         "then": "Bicycles can be recycled here"
+                    },
+                    "3": {
+                        "then": "Clothes can be recycled here"
+                    },
+                    "4": {
+                        "then": "Cooking oil can be recycled here"
+                    },
+                    "5": {
+                        "then": "Engine oil can be recycled here"
+                    },
+                    "6": {
+                        "then": "Fluorescent tubes can be recycled here"
+                    },
+                    "7": {
+                        "then": "Green waste can be recycled here"
+                    },
+                    "8": {
+                        "then": "Organic waste can be recycled here"
+                    },
+                    "9": {
+                        "then": "Glass bottles can be recycled here"
                     }
                 },
                 "question": "What can be recycled here?"
@@ -8835,6 +8835,12 @@
                     "1": {
                         "then": "This lamp uses LEDs"
                     },
+                    "10": {
+                        "then": "This lamp uses high pressure sodium lamps (orange with white)"
+                    },
+                    "11": {
+                        "then": "This lamp is lit using gas"
+                    },
                     "2": {
                         "then": "This lamp uses incandescent lighting"
                     },
@@ -8858,12 +8864,6 @@
                     },
                     "9": {
                         "then": "This lamp uses low pressure sodium lamps (monochrome orange)"
-                    },
-                    "10": {
-                        "then": "This lamp uses high pressure sodium lamps (orange with white)"
-                    },
-                    "11": {
-                        "then": "This lamp is lit using gas"
                     }
                 },
                 "question": "What kind of lighting does this lamp use?"
@@ -9254,10 +9254,10 @@
             "toilet-handwashing": {
                 "mappings": {
                     "0": {
-                        "then": "This toilets have a sink to wash your hands"
+                        "then": "These toilets have a sink to wash your hands"
                     },
                     "1": {
-                        "then": "This toilets <b>don't</b> have a sink to wash your hands"
+                        "then": "These toilets <b>don't</b> have a sink to wash your hands"
                     }
                 },
                 "question": "Do these toilets have a sink to wash your hands?"
@@ -9310,7 +9310,7 @@
                         "then": "Both seated toilets and urinals are available here"
                     }
                 },
-                "question": "Which kind of toilets are this?"
+                "question": "Which kind of toilets are these?"
             },
             "toilets-wheelchair": {
                 "mappings": {
@@ -10003,30 +10003,6 @@
                     "1": {
                         "question": "Sale of drinks"
                     },
-                    "2": {
-                        "question": "Sale of sweets"
-                    },
-                    "3": {
-                        "question": "Sale of food"
-                    },
-                    "4": {
-                        "question": "Sale of cigarettes"
-                    },
-                    "5": {
-                        "question": "Sale of condoms"
-                    },
-                    "6": {
-                        "question": "Sale of coffee"
-                    },
-                    "7": {
-                        "question": "Sale of water"
-                    },
-                    "8": {
-                        "question": "Sale of newspapers"
-                    },
-                    "9": {
-                        "question": "Sale of bicycle inner tubes"
-                    },
                     "10": {
                         "question": "Sale of milk"
                     },
@@ -10057,6 +10033,9 @@
                     "19": {
                         "question": "Sale of pressed pennies"
                     },
+                    "2": {
+                        "question": "Sale of sweets"
+                    },
                     "20": {
                         "question": "Sale of public transport tickets"
                     },
@@ -10074,6 +10053,27 @@
                     },
                     "25": {
                         "question": "Sale of bicycle locks"
+                    },
+                    "3": {
+                        "question": "Sale of food"
+                    },
+                    "4": {
+                        "question": "Sale of cigarettes"
+                    },
+                    "5": {
+                        "question": "Sale of condoms"
+                    },
+                    "6": {
+                        "question": "Sale of coffee"
+                    },
+                    "7": {
+                        "question": "Sale of water"
+                    },
+                    "8": {
+                        "question": "Sale of newspapers"
+                    },
+                    "9": {
+                        "question": "Sale of bicycle inner tubes"
                     }
                 }
             }
@@ -10120,30 +10120,6 @@
                     "1": {
                         "then": "Sweets are sold"
                     },
-                    "2": {
-                        "then": "Food is sold"
-                    },
-                    "3": {
-                        "then": "Cigarettes are sold"
-                    },
-                    "4": {
-                        "then": "Condoms are sold"
-                    },
-                    "5": {
-                        "then": "Coffee is sold"
-                    },
-                    "6": {
-                        "then": "Drinking water is sold"
-                    },
-                    "7": {
-                        "then": "Newspapers are sold"
-                    },
-                    "8": {
-                        "then": "Bicycle inner tubes are sold"
-                    },
-                    "9": {
-                        "then": "Milk is sold"
-                    },
                     "10": {
                         "then": "Bread is sold"
                     },
@@ -10174,6 +10150,9 @@
                     "19": {
                         "then": "Public transport tickets are sold"
                     },
+                    "2": {
+                        "then": "Food is sold"
+                    },
                     "20": {
                         "then": "Bicycle lights are sold"
                     },
@@ -10188,6 +10167,27 @@
                     },
                     "24": {
                         "then": "Bicycle locks are sold"
+                    },
+                    "3": {
+                        "then": "Cigarettes are sold"
+                    },
+                    "4": {
+                        "then": "Condoms are sold"
+                    },
+                    "5": {
+                        "then": "Coffee is sold"
+                    },
+                    "6": {
+                        "then": "Drinking water is sold"
+                    },
+                    "7": {
+                        "then": "Newspapers are sold"
+                    },
+                    "8": {
+                        "then": "Bicycle inner tubes are sold"
+                    },
+                    "9": {
+                        "then": "Milk is sold"
                     }
                 },
                 "question": "What does this vending machine sell?",
@@ -10527,4 +10527,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}