diff --git a/langs/layers/da.json b/langs/layers/da.json
index 2f2a68740..35dc43dc9 100644
--- a/langs/layers/da.json
+++ b/langs/layers/da.json
@@ -94,6 +94,12 @@
                     "1": {
                         "then": "Vægmaleri"
                     },
+                    "10": {
+                        "then": "Azulejo (spansk dekorativt flisebeklædning)"
+                    },
+                    "11": {
+                        "then": "flisebeklædning"
+                    },
                     "2": {
                         "then": "Maleri"
                     },
@@ -117,12 +123,6 @@
                     },
                     "9": {
                         "then": "Relief"
-                    },
-                    "10": {
-                        "then": "Azulejo (spansk dekorativt flisebeklædning)"
-                    },
-                    "11": {
-                        "then": "flisebeklædning"
                     }
                 },
                 "question": "Hvilken slags kunstværk er det?",
@@ -2705,4 +2705,4 @@
             "render": "vindmølle"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/en.json b/langs/layers/en.json
index cd52626b0..b2ad2a120 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -26,7 +26,7 @@
     },
     "advertising": {
         "description": "We will complete data from advertising features with reference, operator and lit",
-        "name": "Advertise",
+        "name": "Advertisement",
         "presets": {
             "0": {
                 "description": "A large outdoor advertising structure, typically found in high-traffic areas such as alongside busy roads",
@@ -171,6 +171,9 @@
                     "1": {
                         "then": "This is a board"
                     },
+                    "10": {
+                        "then": "This is a wall painting"
+                    },
                     "2": {
                         "then": "This is a column"
                     },
@@ -194,9 +197,6 @@
                     },
                     "9": {
                         "then": "This is a totem"
-                    },
-                    "10": {
-                        "then": "This is a wall painting"
                     }
                 },
                 "question": "Which type of advertising feature is this?",
@@ -211,6 +211,9 @@
                 "1": {
                     "then": "Board"
                 },
+                "10": {
+                    "then": "Wall painting"
+                },
                 "2": {
                     "then": "Poster Box"
                 },
@@ -234,9 +237,6 @@
                 },
                 "9": {
                     "then": "Totem"
-                },
-                "10": {
-                    "then": "Wall painting"
                 }
             }
         }
@@ -283,6 +283,9 @@
                     "1": {
                         "then": "This is a gondola where the cars go around in continuous circles"
                     },
+                    "10": {
+                        "then": "A zip line. (A touristical attraction where adventurous people go down at high speeds) "
+                    },
                     "2": {
                         "then": "An open chairlift with seats to sit on and open to the outside air."
                     },
@@ -306,9 +309,6 @@
                     },
                     "9": {
                         "then": "A magic carpet (a conveyor belt on the ground)"
-                    },
-                    "10": {
-                        "then": "A zip line. (A touristical attraction where adventurous people go down at high speeds) "
                     }
                 },
                 "question": "What type of aerialway is this?"
@@ -436,6 +436,15 @@
                     "1": {
                         "then": "Mural"
                     },
+                    "10": {
+                        "then": "Azulejo (Spanish decorative tilework)"
+                    },
+                    "11": {
+                        "then": "Tilework"
+                    },
+                    "12": {
+                        "then": "Woodcarving"
+                    },
                     "2": {
                         "then": "Painting"
                     },
@@ -459,15 +468,6 @@
                     },
                     "9": {
                         "then": "Relief"
-                    },
-                    "10": {
-                        "then": "Azulejo (Spanish decorative tilework)"
-                    },
-                    "11": {
-                        "then": "Tilework"
-                    },
-                    "12": {
-                        "then": "Woodcarving"
                     }
                 },
                 "question": "What is the type of this artwork?",
@@ -1440,7 +1440,7 @@
                         "then": "This parking has designated (official) spots for cargo bikes."
                     },
                     "2": {
-                        "then": "You're not allowed to park cargo bikes"
+                        "then": "You're not allowed to park cargo bikes or there are no places provided for cargo bikes"
                     }
                 },
                 "question": "Does this bicycle parking have spots for cargo bikes?"
@@ -2111,6 +2111,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"
                     },
@@ -2134,27 +2155,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"
                     }
                 }
             }
@@ -2210,30 +2210,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)"
                     },
@@ -2264,6 +2240,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)"
                     },
@@ -2294,11 +2273,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?"
@@ -2492,6 +2492,24 @@
                         "1": {
                             "2": "<b>European wall plug</b> with ground pin (CEE7/4 type E)"
                         },
+                        "10": {
+                            "2": "<b>Tesla Supercharger CCS</b> (a branded type2_css)"
+                        },
+                        "11": {
+                            "2": "<b>Tesla Supercharger (destination)</b>"
+                        },
+                        "12": {
+                            "2": "<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)"
+                        },
+                        "13": {
+                            "2": "<b>USB</b> to charge phones and small electronics"
+                        },
+                        "14": {
+                            "2": "<b>Bosch Active Connect with 3 pins</b> and cable"
+                        },
+                        "15": {
+                            "2": "<b>Bosch Active Connect with 5 pins</b> and cable"
+                        },
                         "2": {
                             "2": "<b>Chademo</b>"
                         },
@@ -2515,24 +2533,6 @@
                         },
                         "9": {
                             "2": "<b>Type 2 with cable</b> (mennekes)"
-                        },
-                        "10": {
-                            "2": "<b>Tesla Supercharger CCS</b> (a branded type2_css)"
-                        },
-                        "11": {
-                            "2": "<b>Tesla Supercharger (destination)</b>"
-                        },
-                        "12": {
-                            "2": "<b>Tesla supercharger (destination)</b> (A Type 2 with cable branded as tesla)"
-                        },
-                        "13": {
-                            "2": "<b>USB</b> to charge phones and small electronics"
-                        },
-                        "14": {
-                            "2": "<b>Bosch Active Connect with 3 pins</b> and cable"
-                        },
-                        "15": {
-                            "2": "<b>Bosch Active Connect with 5 pins</b> and cable"
                         }
                     }
                 }
@@ -3330,6 +3330,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"
                     },
@@ -3353,15 +3362,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?",
@@ -3410,6 +3410,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"
                     },
@@ -3433,15 +3442,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?",
@@ -4429,6 +4429,54 @@
                     }
                 }
             },
+            "10": {
+                "options": {
+                    "0": {
+                        "question": "No preference towards dogs"
+                    },
+                    "1": {
+                        "question": "Dogs allowed"
+                    },
+                    "2": {
+                        "question": "No dogs allowed"
+                    }
+                }
+            },
+            "11": {
+                "options": {
+                    "0": {
+                        "question": "Offers internet"
+                    }
+                }
+            },
+            "12": {
+                "options": {
+                    "0": {
+                        "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"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {
@@ -4499,54 +4547,6 @@
                         "question": "Free to use"
                     }
                 }
-            },
-            "10": {
-                "options": {
-                    "0": {
-                        "question": "No preference towards dogs"
-                    },
-                    "1": {
-                        "question": "Dogs allowed"
-                    },
-                    "2": {
-                        "question": "No dogs allowed"
-                    }
-                }
-            },
-            "11": {
-                "options": {
-                    "0": {
-                        "question": "Offers internet"
-                    }
-                }
-            },
-            "12": {
-                "options": {
-                    "0": {
-                        "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"
-                    }
-                }
             }
         }
     },
@@ -4666,30 +4666,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."
                     },
@@ -4720,6 +4696,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."
                     },
@@ -4734,6 +4713,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?"
@@ -4853,6 +4853,21 @@
                     "1": {
                         "then": "This is a friture"
                     },
+                    "10": {
+                        "then": "Chinese dishes are served here"
+                    },
+                    "11": {
+                        "then": "Greek dishes are served here"
+                    },
+                    "12": {
+                        "then": "Indian dishes are served here"
+                    },
+                    "13": {
+                        "then": "Turkish dishes are served here"
+                    },
+                    "14": {
+                        "then": "Thai dishes are served here"
+                    },
                     "2": {
                         "then": "Mainly serves pasta"
                     },
@@ -4876,21 +4891,6 @@
                     },
                     "9": {
                         "then": "French dishes are served here"
-                    },
-                    "10": {
-                        "then": "Chinese dishes are served here"
-                    },
-                    "11": {
-                        "then": "Greek dishes are served here"
-                    },
-                    "12": {
-                        "then": "Indian dishes are served here"
-                    },
-                    "13": {
-                        "then": "Turkish dishes are served here"
-                    },
-                    "14": {
-                        "then": "Thai dishes are served here"
                     }
                 },
                 "question": "What kind of food is served here?",
@@ -5590,30 +5590,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"
                     },
@@ -5644,6 +5620,9 @@
                     "19": {
                         "then": "This is a storage room"
                     },
+                    "2": {
+                        "then": "This is a bedroom"
+                    },
                     "20": {
                         "then": "This is a technical room"
                     },
@@ -5652,6 +5631,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?"
@@ -6179,6 +6179,18 @@
                     "1": {
                         "then": "This is a plaque"
                     },
+                    "10": {
+                        "then": "This is a cross"
+                    },
+                    "11": {
+                        "then": "This is a blue plaque"
+                    },
+                    "12": {
+                        "then": "This is a historic tank, permanently placed in public space as memorial"
+                    },
+                    "13": {
+                        "then": "This is a memorial tree"
+                    },
                     "2": {
                         "then": "This is a commemorative bench"
                     },
@@ -6202,18 +6214,6 @@
                     },
                     "9": {
                         "then": "This is an obelisk"
-                    },
-                    "10": {
-                        "then": "This is a cross"
-                    },
-                    "11": {
-                        "then": "This is a blue plaque"
-                    },
-                    "12": {
-                        "then": "This is a historic tank, permanently placed in public space as memorial"
-                    },
-                    "13": {
-                        "then": "This is a memorial tree"
                     }
                 },
                 "question": "What type of memorial is this?",
@@ -6397,6 +6397,19 @@
                     }
                 }
             },
+            "10": {
+                "options": {
+                    "0": {
+                        "question": "All Notes"
+                    },
+                    "1": {
+                        "question": "Hide import notes"
+                    },
+                    "2": {
+                        "question": "Show only import Notes"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {
@@ -6452,19 +6465,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",
@@ -6789,6 +6789,18 @@
                     "1": {
                         "then": "This is a normal parking space."
                     },
+                    "10": {
+                        "then": "This is a parking space reserved for staff."
+                    },
+                    "11": {
+                        "then": "This is a parking space reserved for taxis."
+                    },
+                    "12": {
+                        "then": "This is a parking space reserved for vehicles towing a trailer."
+                    },
+                    "13": {
+                        "then": "This is a parking space reserved for car sharing."
+                    },
                     "2": {
                         "then": "This is a disabled parking space."
                     },
@@ -6812,18 +6824,6 @@
                     },
                     "9": {
                         "then": "This is a parking space reserved for parents with children."
-                    },
-                    "10": {
-                        "then": "This is a parking space reserved for staff."
-                    },
-                    "11": {
-                        "then": "This is a parking space reserved for taxis."
-                    },
-                    "12": {
-                        "then": "This is a parking space reserved for vehicles towing a trailer."
-                    },
-                    "13": {
-                        "then": "This is a parking space reserved for car sharing."
                     }
                 },
                 "question": "What kind of parking space is this?"
@@ -7137,30 +7137,6 @@
                     "1": {
                         "then": "This is a structure consisting of several connected playground devices"
                     },
-                    "2": {
-                        "then": "This is a slide"
-                    },
-                    "3": {
-                        "then": "This is a sand pit"
-                    },
-                    "4": {
-                        "then": "This is a spring rider"
-                    },
-                    "5": {
-                        "then": "This is a climbing frame"
-                    },
-                    "6": {
-                        "then": "This is a seesaw"
-                    },
-                    "7": {
-                        "then": "This is a playhouse"
-                    },
-                    "8": {
-                        "then": "This is a roundabout"
-                    },
-                    "9": {
-                        "then": "This is a basket swing"
-                    },
                     "10": {
                         "then": "This is a zip wire"
                     },
@@ -7191,11 +7167,35 @@
                     "19": {
                         "then": "This is a teen shelter"
                     },
+                    "2": {
+                        "then": "This is a slide"
+                    },
                     "20": {
                         "then": "This is a funnel used to play with funnel ball"
                     },
                     "21": {
                         "then": "This is a spinning circle"
+                    },
+                    "3": {
+                        "then": "This is a sand pit"
+                    },
+                    "4": {
+                        "then": "This is a spring rider"
+                    },
+                    "5": {
+                        "then": "This is a climbing frame"
+                    },
+                    "6": {
+                        "then": "This is a seesaw"
+                    },
+                    "7": {
+                        "then": "This is a playhouse"
+                    },
+                    "8": {
+                        "then": "This is a roundabout"
+                    },
+                    "9": {
+                        "then": "This is a basket swing"
                     }
                 },
                 "question": "What kind of device is this?",
@@ -7556,6 +7556,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"
                     },
@@ -7579,21 +7594,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?"
@@ -7606,6 +7606,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"
                     },
@@ -7629,15 +7638,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?"
@@ -8096,30 +8096,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"
                     },
@@ -8150,11 +8126,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"
                     }
                 }
             },
@@ -8222,30 +8222,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"
                     },
@@ -8276,6 +8252,9 @@
                     "19": {
                         "then": "Shoes can be recycled here"
                     },
+                    "2": {
+                        "then": "Cans can be recycled here"
+                    },
                     "20": {
                         "then": "Small electrical appliances can be recycled here"
                     },
@@ -8290,6 +8269,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?"
@@ -9351,6 +9351,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"
                     },
@@ -9374,12 +9380,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?"
@@ -10774,30 +10774,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"
                     },
@@ -10828,6 +10804,9 @@
                     "19": {
                         "question": "Sale of flowers"
                     },
+                    "2": {
+                        "question": "Sale of sweets"
+                    },
                     "20": {
                         "question": "Sale of parking tickets"
                     },
@@ -10851,6 +10830,27 @@
                     },
                     "27": {
                         "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"
                     }
                 }
             }
@@ -10897,30 +10897,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"
                     },
@@ -10951,6 +10927,9 @@
                     "19": {
                         "then": "Parking tickets are sold"
                     },
+                    "2": {
+                        "then": "Food is sold"
+                    },
                     "20": {
                         "then": "Pressed pennies are sold"
                     },
@@ -10971,6 +10950,27 @@
                     },
                     "26": {
                         "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?",
@@ -11262,4 +11262,4 @@
             "render": "wind turbine"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/eu.json b/langs/layers/eu.json
index 937736949..a632fef5d 100644
--- a/langs/layers/eu.json
+++ b/langs/layers/eu.json
@@ -101,6 +101,12 @@
                     "1": {
                         "then": "Murala"
                     },
+                    "11": {
+                        "then": "Keramika"
+                    },
+                    "12": {
+                        "then": "Egur taila"
+                    },
                     "2": {
                         "then": "Margolana"
                     },
@@ -124,12 +130,6 @@
                     },
                     "9": {
                         "then": "Erliebea"
-                    },
-                    "11": {
-                        "then": "Keramika"
-                    },
-                    "12": {
-                        "then": "Egur taila"
                     }
                 }
             }
@@ -289,4 +289,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/gl.json b/langs/layers/gl.json
index f5a502b3d..fa1439a1f 100644
--- a/langs/layers/gl.json
+++ b/langs/layers/gl.json
@@ -394,4 +394,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/pt.json b/langs/layers/pt.json
index d8f2eaf62..d8f721000 100644
--- a/langs/layers/pt.json
+++ b/langs/layers/pt.json
@@ -165,6 +165,9 @@
                     "1": {
                         "then": "Isso é uma placa"
                     },
+                    "10": {
+                        "then": "Isto é uma pintura mural"
+                    },
                     "2": {
                         "then": "Isto é uma coluna"
                     },
@@ -188,9 +191,6 @@
                     },
                     "9": {
                         "then": "Isto é um totem"
-                    },
-                    "10": {
-                        "then": "Isto é uma pintura mural"
                     }
                 },
                 "question": "Que tipo de recurso de publicitário é este?",
@@ -205,6 +205,9 @@
                 "1": {
                     "then": "Quadro"
                 },
+                "10": {
+                    "then": "Pintura mural"
+                },
                 "2": {
                     "then": "Caixa de pôster"
                 },
@@ -228,9 +231,6 @@
                 },
                 "9": {
                     "then": "Totem"
-                },
-                "10": {
-                    "then": "Pintura mural"
                 }
             }
         }
@@ -323,6 +323,15 @@
                     "1": {
                         "then": "Mural"
                     },
+                    "10": {
+                        "then": "Azulejo (azulejo decorativo espanhol e português)"
+                    },
+                    "11": {
+                        "then": "Ladrilhos"
+                    },
+                    "12": {
+                        "then": "Entalhe em madeira"
+                    },
                     "2": {
                         "then": "Pintura"
                     },
@@ -346,15 +355,6 @@
                     },
                     "9": {
                         "then": "Relevo"
-                    },
-                    "10": {
-                        "then": "Azulejo (azulejo decorativo espanhol e português)"
-                    },
-                    "11": {
-                        "then": "Ladrilhos"
-                    },
-                    "12": {
-                        "then": "Entalhe em madeira"
                     }
                 },
                 "question": "Qual é o tipo desta obra de arte?",
@@ -1925,4 +1925,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json
index 46ea81bdf..d892f3a42 100644
--- a/langs/layers/pt_BR.json
+++ b/langs/layers/pt_BR.json
@@ -165,6 +165,9 @@
                     "1": {
                         "then": "Isso é uma placa"
                     },
+                    "10": {
+                        "then": "Isso é uma pintura mural"
+                    },
                     "2": {
                         "then": "Isto é uma coluna"
                     },
@@ -188,9 +191,6 @@
                     },
                     "9": {
                         "then": "Isso é um totem"
-                    },
-                    "10": {
-                        "then": "Isso é uma pintura mural"
                     }
                 },
                 "question": "Que tipo de recurso de publicitário é este?",
@@ -205,6 +205,9 @@
                 "1": {
                     "then": "Quadro"
                 },
+                "10": {
+                    "then": "Pintura mural"
+                },
                 "2": {
                     "then": "Caixa de pôster"
                 },
@@ -228,9 +231,6 @@
                 },
                 "9": {
                     "then": "Totem"
-                },
-                "10": {
-                    "then": "Pintura mural"
                 }
             }
         }
@@ -312,6 +312,15 @@
                     "1": {
                         "then": "Mural"
                     },
+                    "10": {
+                        "then": "Azulejo (Revestimento de azulejos decorativos espanhóis)"
+                    },
+                    "11": {
+                        "then": "Azulejaria"
+                    },
+                    "12": {
+                        "then": "Entalhe"
+                    },
                     "2": {
                         "then": "Pintura"
                     },
@@ -335,15 +344,6 @@
                     },
                     "9": {
                         "then": "Relevo"
-                    },
-                    "10": {
-                        "then": "Azulejo (Revestimento de azulejos decorativos espanhóis)"
-                    },
-                    "11": {
-                        "then": "Azulejaria"
-                    },
-                    "12": {
-                        "then": "Entalhe"
                     }
                 },
                 "question": "Qual é o tipo dessa obra de arte?",
@@ -1589,4 +1589,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/sl.json b/langs/layers/sl.json
index 7ab6436af..710497b57 100644
--- a/langs/layers/sl.json
+++ b/langs/layers/sl.json
@@ -1,4 +1,14 @@
 {
+    "atm": {
+        "tagRenderings": {
+            "operator": {
+                "render": "Ta bankomat upravlja {operator}"
+            }
+        },
+        "title": {
+            "render": "Bankomat"
+        }
+    },
     "defibrillator": {
         "description": "Sloj prikazuje defibrilatorje, ki jih je možno uporabiti v primeru sile. Sloj poleg javno dostopnih defibrilatorjev vsebuje tudi tiste, ki za dostop morda potrebujejo pomoč osebja",
         "name": "Defibrilatorji",
diff --git a/langs/layers/zh_Hans.json b/langs/layers/zh_Hans.json
index 3159a582d..640083ca5 100644
--- a/langs/layers/zh_Hans.json
+++ b/langs/layers/zh_Hans.json
@@ -150,6 +150,9 @@
                     "1": {
                         "then": "这是一块板"
                     },
+                    "10": {
+                        "then": "这是一幅壁画"
+                    },
                     "2": {
                         "then": "这是一个专栏"
                     },
@@ -173,9 +176,6 @@
                     },
                     "9": {
                         "then": "这是一个图腾"
-                    },
-                    "10": {
-                        "then": "这是一幅壁画"
                     }
                 },
                 "question": "这是哪种类型的广告功能?",
@@ -190,6 +190,9 @@
                 "1": {
                     "then": "木板"
                 },
+                "10": {
+                    "then": "墙上的画"
+                },
                 "2": {
                     "then": "海报盒"
                 },
@@ -210,9 +213,6 @@
                 },
                 "9": {
                     "then": "图腾"
-                },
-                "10": {
-                    "then": "墙上的画"
                 }
             }
         }
@@ -335,6 +335,9 @@
                     "1": {
                         "then": "壁画"
                     },
+                    "10": {
+                        "then": "Azulejo(西班牙装饰瓷砖)"
+                    },
                     "2": {
                         "then": "喷绘"
                     },
@@ -355,9 +358,6 @@
                     },
                     "8": {
                         "then": "涂鸦/粗糙雕刻"
-                    },
-                    "10": {
-                        "then": "Azulejo(西班牙装饰瓷砖)"
                     }
                 }
             }
@@ -631,4 +631,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/langs/layers/zh_Hant.json b/langs/layers/zh_Hant.json
index 20ef18f0f..88b6dd443 100644
--- a/langs/layers/zh_Hant.json
+++ b/langs/layers/zh_Hant.json
@@ -52,6 +52,12 @@
                     "1": {
                         "then": "壁畫"
                     },
+                    "10": {
+                        "then": "Azulejo (西班牙雕塑作品名稱)"
+                    },
+                    "11": {
+                        "then": "瓷磚"
+                    },
                     "2": {
                         "then": "繪畫"
                     },
@@ -75,12 +81,6 @@
                     },
                     "9": {
                         "then": "寬慰"
-                    },
-                    "10": {
-                        "then": "Azulejo (西班牙雕塑作品名稱)"
-                    },
-                    "11": {
-                        "then": "瓷磚"
                     }
                 },
                 "question": "這是什麼類型的藝術品?",
@@ -856,4 +856,4 @@
             "render": "風機"
         }
     }
-}
\ No newline at end of file
+}