diff --git a/.prettierignore b/.prettierignore
index cc6dedb..8228df2 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,5 @@
 LICENSE
+Dockerfile
 dist/
 *.zip
 yarn.lock
@@ -10,8 +11,7 @@ yarn.lock
 layers/
 locales/*.json
 resources/boundaries/
-*.sh
+resources/standalone/*.sh
 profiles2/
-Dockerfile
 tests/**/*.json
 tests/**/*.gpx
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ec7de6..3de89b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # BRouter-Web Changelog
 
+## 0.16.0 (2021-03-30)
+
+### New Features
+
+-   Locations (POIs) layers powered by Overpass API available in optional layers (under "More") and as custom query in "Custom layers" - by [@stesie](https://github.com/stesie) ([#106](https://github.com/nrenner/brouter-web/issues/106), [#384](https://github.com/nrenner/brouter-web/pull/384))
+-   Message informs about new versions since last visit, "What's new?" button in "About" - by [@bagage](https://github.com/bagage) ([#372](https://github.com/nrenner/brouter-web/pull/372))
+
+### Improvements
+
+-   Confirm "Delete Route" with Enter key (after opening "Clear" dialog with Backspace key) - by [@mjaschen](https://github.com/mjaschen) ([#385](https://github.com/nrenner/brouter-web/issues/385))
+-   Improve mobile responsivity (full screen dialogs and more) - by [@bagage](https://github.com/bagage) ([#296](https://github.com/nrenner/brouter-web/issues/296))
+-   Gray out unselectable layers below minimum zoom - by [@bagage](https://github.com/bagage) ([#381](https://github.com/nrenner/brouter-web/pull/381))
+-   Add message if no elevation data is available - by [@bagage](https://github.com/bagage) ([#365](https://github.com/nrenner/brouter-web/issues/365))
+-   Size limit for loading a track increased to 10 MiB ([dd34064](https://github.com/nrenner/brouter-web/commit/dd34064e8c09f1bc6b11e2e14e1bb83d41a61ed9))
+-   Update France Go area to 10km - by [@bagage](https://github.com/bagage) ([1c13587](https://github.com/nrenner/brouter-web/commit/1c135879746f670b1a854fcbe55ab5dabacfa0a9))
+
+### Bugfixes
+
+-   Flickering search field on Firefox @ Android - by [@mjaschen](https://github.com/mjaschen) ([#393](https://github.com/nrenner/brouter-web/issues/393))
+-   Custom layers table width and type translations added - by [@bagage](https://github.com/bagage) ([#379](https://github.com/nrenner/brouter-web/pull/379))
+
+### Local installation / development
+
+-   New config entries `overpassBaseUrl` and `trackSizeLimit` ([config.template.js](https://github.com/nrenner/brouter-web/blob/a2717ac10298f5e9689b420a0af0eb310eababd3/config.template.js#L131-L134))
+
 ## 0.15.1 (2021-01-25)
 
 ### Improvements [de, fr]
diff --git a/README.md b/README.md
index 269d120..a04fd0c 100644
--- a/README.md
+++ b/README.md
@@ -134,3 +134,9 @@ Copyright (c) 2018 Norbert Renner and [contributors](https://github.com/nrenner/
     Copyright (c) 2015, Mapbox All rights reserved; [BSD-2-Clause License](https://github.com/mapbox/tokml/blob/master/LICENSE.md)
 -   [Jest](https://github.com/facebook/jest)  
     Copyright (c) Facebook, Inc. and its affiliates; [MIT License](https://github.com/facebook/jest/blob/master/LICENSE)
+-   [overpass-layer](https://github.com/plepe/overpass-layer)
+    Copyright (c) 2020 Stephan Bösch-Plepelits; [MIT License](https://github.com/plepe/overpass-layer/blob/master/LICENSE)
+-   [maki](https://github.com/mapbox/maki)
+    [CC0-1.0 License](https://github.com/mapbox/maki/blob/master/LICENSE.txt)
+-   [temaki](https://github.com/ideditor/temaki)
+    [CC0-1.0 License](https://github.com/ideditor/temaki/blob/main/LICENSE.md)
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000..98814cd
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+    presets: [['@babel/preset-env', {}]],
+    sourceType: 'script',
+    exclude: [/node_modules\/(?!overpass-layer\/).*/],
+};
diff --git a/babel.config.json b/babel.config.json
deleted file mode 100644
index ff0cf28..0000000
--- a/babel.config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "presets": [["@babel/preset-env", {}]],
-    "sourceType": "script",
-    "exclude": ["node_modules/**"]
-}
diff --git a/config.template.js b/config.template.js
index 4604bf0..09a97e6 100644
--- a/config.template.js
+++ b/config.template.js
@@ -127,4 +127,9 @@
 
     // regex needs to be in sync with server, see ServerHandler.getTrackName()
     BR.conf.tracknameAllowedChars = 'a-zA-Z0-9 \\._\\-';
+
+    BR.conf.overpassBaseUrl = 'https://overpass.kumi.systems/api/interpreter';
+
+    // File size limit in kb for loading tracks
+    BR.conf.trackSizeLimit = 1024 * 10;
 })();
diff --git a/css/style.css b/css/style.css
index 2dbf8c2..de47a03 100644
--- a/css/style.css
+++ b/css/style.css
@@ -45,6 +45,37 @@ table.dataTable {
     flex: auto;
 }
 
+/* reduce title font size in overpass popups */
+.leaflet-popup-content h1 {
+    font-size: 1.2rem;
+}
+
+.overpass-tags th {
+    vertical-align: top;
+}
+
+.overpass-layer-icon .sign > * {
+    position: absolute;
+    top: -34px;
+    margin: auto;
+    display: inline-block;
+    font-size: 11px;
+}
+
+.overpass-layer-icon .icon-white {
+    color: white;
+}
+
+.overpass-layer-icon .icon-invert {
+    -webkit-filter: invert(1);
+    filter: invert(1);
+}
+
+.jstree-themeicon-custom {
+    background-size: 11px !important;
+    width: 15px !important;
+}
+
 /* wrap toolbar controls */
 .leaflet-top.leaflet-left {
     bottom: 0;
@@ -215,11 +246,14 @@ input#trackname:focus:invalid {
     /* map click/drag selects text in controls in Firefox because of display flex */
     -moz-user-select: none;
 }
-.leaflet-control-container,
-#message .alert {
+.leaflet-control-container {
     -moz-user-select: text;
 }
-#message {
+#notification_jar .alert {
+    -moz-user-select: text;
+    margin-bottom: 10px;
+}
+#notification_jar {
     position: absolute;
     margin: 10px 46px; /* 10 + 26 + 10 */
     z-index: 3001;
@@ -242,10 +276,6 @@ input#trackname:focus:invalid {
     display: flex;
 }
 
-#profile_buttons {
-    padding-top: 4px;
-}
-
 /* track messages (data tab) */
 #tab_data,
 .CodeMirror {
@@ -438,6 +468,19 @@ button.btn {
     margin: -6px 0 6px 20px;
 }
 
+/* "What's new?" (Change Log) */
+#whatsnew h2 {
+    margin: 2rem 0;
+    border-bottom: 1px solid #dee2e6;
+    padding-bottom: 0.5rem;
+    font-size: 1.3rem;
+}
+
+#whatsnew h3 {
+    margin-bottom: 1rem;
+    font-size: 1.1rem;
+}
+
 /*
 * DataTables
 */
@@ -783,3 +826,141 @@ table.dataTable.display tbody tr:hover.selected {
     left: 50%;
     transform: translate(-50%, -50%);
 }
+
+/* Gray out non selectable layers (zoom out of scope, etc.) */
+.leaflet-control-layers-selector[disabled] ~ span {
+    color: #777;
+}
+
+/* make modals fullscreen on small devices (code from bootstrap 5) */
+.modal-fullscreen {
+    width: 100vw;
+    max-width: none;
+    height: 100%;
+    margin: 0;
+}
+.modal-fullscreen .modal-content {
+    height: 100%;
+    border: 0;
+    border-radius: 0;
+}
+.modal-fullscreen .modal-header {
+    border-radius: 0;
+}
+.modal-fullscreen .modal-body {
+    overflow-y: auto;
+}
+.modal-fullscreen .modal-footer {
+    border-radius: 0;
+}
+
+@media (max-width: 575.98px) {
+    .modal-fullscreen-sm-down {
+        width: 100vw;
+        max-width: none;
+        height: 100%;
+        margin: 0;
+    }
+    .modal-fullscreen-sm-down .modal-content {
+        height: 100%;
+        border: 0;
+        border-radius: 0;
+    }
+    .modal-fullscreen-sm-down .modal-header {
+        border-radius: 0;
+    }
+    .modal-fullscreen-sm-down .modal-body {
+        overflow-y: auto;
+    }
+    .modal-fullscreen-sm-down .modal-footer {
+        border-radius: 0;
+    }
+}
+@media (max-width: 767.98px) {
+    .modal-fullscreen-md-down {
+        width: 100vw;
+        max-width: none;
+        height: 100%;
+        margin: 0;
+    }
+    .modal-fullscreen-md-down .modal-content {
+        height: 100%;
+        border: 0;
+        border-radius: 0;
+    }
+    .modal-fullscreen-md-down .modal-header {
+        border-radius: 0;
+    }
+    .modal-fullscreen-md-down .modal-body {
+        overflow-y: auto;
+    }
+    .modal-fullscreen-md-down .modal-footer {
+        border-radius: 0;
+    }
+}
+@media (max-width: 991.98px) {
+    .modal-fullscreen-lg-down {
+        width: 100vw;
+        max-width: none;
+        height: 100%;
+        margin: 0;
+    }
+    .modal-fullscreen-lg-down .modal-content {
+        height: 100%;
+        border: 0;
+        border-radius: 0;
+    }
+    .modal-fullscreen-lg-down .modal-header {
+        border-radius: 0;
+    }
+    .modal-fullscreen-lg-down .modal-body {
+        overflow-y: auto;
+    }
+    .modal-fullscreen-lg-down .modal-footer {
+        border-radius: 0;
+    }
+}
+@media (max-width: 1199.98px) {
+    .modal-fullscreen-xl-down {
+        width: 100vw;
+        max-width: none;
+        height: 100%;
+        margin: 0;
+    }
+    .modal-fullscreen-xl-down .modal-content {
+        height: 100%;
+        border: 0;
+        border-radius: 0;
+    }
+    .modal-fullscreen-xl-down .modal-header {
+        border-radius: 0;
+    }
+    .modal-fullscreen-xl-down .modal-body {
+        overflow-y: auto;
+    }
+    .modal-fullscreen-xl-down .modal-footer {
+        border-radius: 0;
+    }
+}
+@media (max-width: 1399.98px) {
+    .modal-fullscreen-xxl-down {
+        width: 100vw;
+        max-width: none;
+        height: 100%;
+        margin: 0;
+    }
+    .modal-fullscreen-xxl-down .modal-content {
+        height: 100%;
+        border: 0;
+        border-radius: 0;
+    }
+    .modal-fullscreen-xxl-down .modal-header {
+        border-radius: 0;
+    }
+    .modal-fullscreen-xxl-down .modal-body {
+        overflow-y: auto;
+    }
+    .modal-fullscreen-xxl-down .modal-footer {
+        border-radius: 0;
+    }
+}
diff --git a/gulpfile.js b/gulpfile.js
index 3888315..5c56204 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -81,6 +81,7 @@ var paths = {
         .concat('css/*.css'),
     images: mainNpmFiles().filter((f) => RegExp('.*.+(png|gif|svg)', 'i').test(f)),
     fonts: mainNpmFiles().filter((f) => RegExp('font-awesome/fonts/.*', 'i').test(f)),
+    changelog: 'CHANGELOG.md',
     locales: 'locales/*.json',
     layers: 'layers/**/*.geojson',
     layersDestName: 'layers.js',
@@ -189,7 +190,8 @@ gulp.task('boundaries', function () {
 });
 
 gulp.task('changelog', function (cb) {
-    var content = 'BR.changelog = `' + marked(fs.readFileSync('./CHANGELOG.md', 'utf-8')) + '`';
+    var content = 'BR.changelog = `' + marked(fs.readFileSync(paths.changelog, 'utf-8')) + '`';
+    content = content.replace(/<h1.*<\/h1>/i, '');
     fs.writeFile(paths.dest + '/changelog.js', content, cb);
 });
 
@@ -207,6 +209,7 @@ gulp.task('watch', function () {
             remember.forget('scripts', event.path);
         }
     });
+    gulp.watch(paths.changelog, gulp.series('changelog', 'reload'));
     gulp.watch(paths.locales, gulp.series('locales', 'reload'));
     gulp.watch(paths.styles, gulp.series('styles', 'reload'));
     gulp.watch(paths.layersConfig, gulp.series('layers_config', 'reload'));
@@ -283,13 +286,16 @@ gulp.task('bump:json', function () {
 });
 
 gulp.task('bump:html', function () {
+    const version = nextVersion || pkg.version;
     return gulp
         .src('./index.html')
-        .pipe(replace(/<sup class="version">(.*)<\/sup>/, '<sup class="version">' + pkg.version + '</sup>'))
-        .pipe(replace(/BR.version = '(.*?)';/, "BR.version = '" + pkg.version + "';"))
+        .pipe(replace(/<sup class="version">(.*)<\/sup>/, '<sup class="version">' + version + '</sup>'))
+        .pipe(replace(/BR.version = '(.*?)';/, "BR.version = '" + version + "';"))
         .pipe(gulp.dest('.'));
 });
 
+gulp.task('bump', gulp.series('bump:json', 'bump:html'));
+
 gulp.task('release:commit', function () {
     return gulp.src(['./index.html', './package.json']).pipe(git.commit('release: ' + nextVersion));
 });
@@ -468,7 +474,7 @@ gulp.task(
     'release',
     gulp.series(
         'release:init',
-        'bump:json',
+        'bump',
         'release:commit',
         'release:tag',
         'release:push',
diff --git a/index.html b/index.html
index e4aa5f4..5185d5a 100644
--- a/index.html
+++ b/index.html
@@ -11,6 +11,7 @@
         <link rel="stylesheet" href="dist/brouter-web.css" />
         <!-- endinject -->
     </head>
+
     <body class="flexcolumn">
         <nav class="navbar navbar-expand-md navbar-dark bg-dark">
             <button
@@ -25,7 +26,7 @@
                 <span class="fa fa-bars"></span>
             </button>
             <a class="navbar-brand order-md-last" href="#" data-toggle="modal" data-target="#about"
-                >BRouter-Web <sup class="version">0.15.1</sup></a
+                >BRouter-Web <sup class="version">0.16.0</sup></a
             >
             <div class="collapse navbar-collapse" id="collapsingNavbar">
                 <div class="navbar-nav">
@@ -70,7 +71,6 @@
                     <div class="nav-item dropdown">
                         <a
                             class="nav-link dropdown-toggle"
-                            href=""
                             data-toggle="dropdown"
                             href="#"
                             role="button"
@@ -81,8 +81,10 @@
                             data-i18n-options='{
                                 "tracksAction": "$t(navbar.load.tracks)",
                                 "tracksKey": "O",
+                                "trackAsRouteAction": "$t(trackasroute.title)",
+                                "trackAsRouteKey": "$t(keyboard.shift)+O",
                                 "nogosAction": "$t(navbar.load.nogos)",
-                                "nogosKey": "$t(keyboard.shift)+O"
+                                "nogosKey": "$t(keyboard.shift)+N"
                             }'
                             title="Load route"
                         >
@@ -100,7 +102,7 @@
                                     class="dropdown-item"
                                     data-i18n="trackasroute.title"
                                     data-toggle="modal"
-                                    data-target="#loadedittrackdlg"
+                                    data-target="#loadedittrack"
                                     href="#"
                                     id="navbarLoadEditTracks"
                                     >Track as Route</a
@@ -140,7 +142,7 @@
             aria-labelledby="Credits window"
             aria-hidden="true"
         >
-            <div class="modal-dialog" role="document">
+            <div class="modal-dialog modal-fullscreen-md-down" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h4 class="modal-title" data-i18n="credits.title">Credits</h4>
@@ -171,7 +173,11 @@
                             <dd data-i18n="[html]credits.boundaries">
                                 Administrative Boundaries:
                                 <a href="https://osm-boundaries.com" target="_blank">OSM-Boundaries</a>,
-                                <a href="https://overpass-api.de/" target="_blank">Overpass API</a>
+                                <a href="https://overpass-api.de/" class="overpass-url" target="_blank">Overpass API</a>
+                            </dd>
+                            <dd data-i18n="[html]credits.pois">
+                                Locations (POIs):
+                                <a href="https://overpass-api.de/" class="overpass-url" target="_blank">Overpass API</a>
                             </dd>
                             <dt data-i18n="credits.elevation-data">Elevation data</dt>
                             <dd>
@@ -181,6 +187,11 @@
                         <h5 data-i18n="credits.map-tiles">Map tiles</h5>
                         <dl id="credits-maps"></dl>
                     </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary" data-i18n="modal.close" data-dismiss="modal">
+                            Close
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
@@ -194,7 +205,7 @@
             aria-labelledby="Layers window"
             aria-hidden="true"
         >
-            <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-dialog modal-lg modal-fullscreen-md-down" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h4 class="modal-title" data-i18n="layers.customize">Customize layers</h4>
@@ -203,24 +214,26 @@
                         </button>
                     </div>
                     <div class="modal-body">
-                        <input
-                            class="form-control"
-                            type="text"
-                            id="layer_name"
-                            spellcheck="true"
-                            wrap="off"
-                            data-i18n="[placeholder]layers.placeholder-layer-name"
-                            placeholder="Custom layer name. (ex: OpenStreetMap)"
-                        />
-                        <input
-                            class="form-control"
-                            type="text"
-                            id="layer_url"
-                            spellcheck="false"
-                            wrap="off"
-                            data-i18n="[placeholder]layers.placeholder-layer-url"
-                            placeholder="Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)"
-                        />
+                        <div class="form-group">
+                            <label for="layer_name" data-i18n="layers.custom-layer-name-label">Custom layer name</label>
+                            <input class="form-control" type="text" id="layer_name" spellcheck="true" wrap="off" />
+                            <p class="help-block" data-i18n="layers.custom-layer-name-helptext">ex: OpenStreetMap</p>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="layer_name" data-i18n="layers.custom-layer-url-label"
+                                >Custom layer URL/Query</label
+                            >
+                            <input class="form-control" type="text" id="layer_url" spellcheck="false" wrap="off" />
+                            <p class="help-block">
+                                <span data-i18n="layers.custom-layer-url-helptext-normal"
+                                    >URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png</span
+                                ><br />
+                                <span data-i18n="layers.custom-layer-url-helptext-overpass"
+                                    >Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];</span
+                                >
+                            </p>
+                        </div>
 
                         <button
                             type="button"
@@ -238,6 +251,14 @@
                         >
                             Add overlay
                         </button>
+                        <button
+                            type="button"
+                            id="custom_layers_add_overpass"
+                            class="btn btn-success"
+                            data-i18n="layers.add-overpass"
+                        >
+                            Add overpass query
+                        </button>
                         <button
                             type="button"
                             id="custom_layers_remove"
@@ -261,7 +282,7 @@
             aria-labelledby="About window"
             aria-hidden="true"
         >
-            <div class="modal-dialog" role="document">
+            <div class="modal-dialog modal-fullscreen-md-down" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h4 class="modal-title" data-i18n="about.title">About</h4>
@@ -341,7 +362,7 @@
                             on the client.
                         </p>
                     </div>
-                    <div class="modal-footer mt-4">
+                    <div class="modal-footer">
                         <button
                             type="button"
                             class="btn btn-secondary"
@@ -368,7 +389,7 @@
             aria-labelledby="What's new window"
             aria-hidden="true"
         >
-            <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-dialog modal-lg modal-fullscreen-md-down" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h4 class="modal-title" data-i18n="whatsnew.title">What's new?</h4>
@@ -379,7 +400,7 @@
                     <div class="modal-body">
                         <!-- will be filled automatically -->
                     </div>
-                    <div class="modal-footer mt-4">
+                    <div class="modal-footer">
                         <button type="button" class="btn btn-primary" data-i18n="modal.close" data-dismiss="modal">
                             Close
                         </button>
@@ -388,83 +409,6 @@
             </div>
         </div>
 
-        <!-- Load nogos modal window -->
-        <div
-            class="modal fade"
-            id="loadNogos"
-            tabindex="-1"
-            role="dialog"
-            aria-labelledby="Load nogos window"
-            aria-hidden="true"
-        >
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title" data-i18n="loadNogos.title">Load no-go areas</h4>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <p id="nogoError" class="invalid-feedback" style="display: none"></p>
-                        <form>
-                            <fieldset>
-                                <legend data-i18n="loadNogos.source">Source</legend>
-                                <p>
-                                    <input type="text" id="nogoJSON" hidden />
-                                    <label for="nogoURL" data-i18n="loadNogos.url">URL: </label>
-                                    <input type="text" name="nogoURL" id="nogoURL" /><br />
-                                    or<br />
-                                    <label for="nogoFile" data-i18n="loadNogos.file">File (.geojson): </label>
-                                    <input type="file" accept=".geojson" name="nogoFile" id="nogoFile" />
-                                </p>
-                            </fieldset>
-                            <fieldset>
-                                <legend data-i18n="loadNogos.defaultProperties">Default properties</legend>
-                                <p>
-                                    <label for="nogoWeight" data-i18n="loadNogos.nogoWeight"
-                                        >No-go weight (-1 means impassable):
-                                    </label>
-                                    <input type="number" name="nogoWeight" id="nogoWeight" value="-1" min="-1" />
-                                </p>
-                                <p>
-                                    <label for="nogoRadius" data-i18n="loadNogos.nogoRadius"
-                                        >No-go radius for points (in meters):
-                                    </label>
-                                    <input type="number" name="nogoRadius" id="nogoRadius" value="20" min="0" />
-                                </p>
-                                <p>
-                                    <label for="nogoBuffer" data-i18n="loadNogos.nogoBuffer"
-                                        >Buffer no-go areas (in meters):
-                                    </label>
-                                    <input type="number" name="nogoBuffer" id="nogoBuffer" value="0" min="0" />
-                                </p>
-                            </fieldset>
-                            <div class="modal-footer">
-                                <button
-                                    type="button"
-                                    class="btn btn-secondary"
-                                    data-i18n="[value]modal.close"
-                                    data-dismiss="modal"
-                                >
-                                    Close
-                                </button>
-
-                                <button
-                                    type="button"
-                                    class="btn btn-primary"
-                                    data-i18n="[value]loadNogos.load"
-                                    id="submitNogos"
-                                >
-                                    Load
-                                </button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-
         <!-- Export modal window -->
         <div
             class="modal fade"
@@ -474,7 +418,7 @@
             aria-labelledby="Export route window"
             aria-hidden="true"
         >
-            <div class="modal-dialog" role="document">
+            <div class="modal-dialog modal-fullscreen-md-down" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h4 class="modal-title" data-i18n="export.title">Export route</h4>
@@ -483,7 +427,7 @@
                         </button>
                     </div>
                     <div class="modal-body">
-                        <form name="export">
+                        <form name="export" id="exportForm">
                             <div class="form-group row">
                                 <label class="col-form-label col-sm-2" data-i18n="export.trackname">Name</label>
                                 <div class="col-sm-10">
@@ -565,26 +509,22 @@
                                     </div>
                                 </div>
                             </fieldset>
-                            <div class="modal-footer">
-                                <button
-                                    type="button"
-                                    class="btn btn-secondary"
-                                    data-i18n="modal.close"
-                                    data-dismiss="modal"
-                                >
-                                    Close
-                                </button>
-                                <button
-                                    type="submit"
-                                    class="btn btn-primary"
-                                    data-i18n="export.title"
-                                    id="submitExport"
-                                >
-                                    Export route
-                                </button>
-                            </div>
                         </form>
                     </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-i18n="modal.close" data-dismiss="modal">
+                            Close
+                        </button>
+                        <button
+                            type="submit"
+                            class="btn btn-primary"
+                            data-i18n="export.title"
+                            form="exportForm"
+                            id="submitExport"
+                        >
+                            Export route
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
@@ -592,13 +532,13 @@
         <!-- Track to Route modal window -->
         <div
             class="modal fade"
-            id="loadedittrackdlg"
+            id="loadedittrack"
             tabindex="-1"
             role="dialog"
             aria-labelledby="Load Track as route"
             aria-hidden="true"
         >
-            <div class="modal-dialog" role="document">
+            <div class="modal-dialog modal-lg modal-fullscreen-md-down" role="document">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h4 class="modal-title" data-i18n="trackasroute.title">Load Track as Route</h4>
@@ -609,65 +549,81 @@
                     </div>
                     <div class="modal-body">
                         <form name="loadedittrackForm" id="loadedittrackForm">
-                            <div class="form-group row mt-4">
-                                <label class="col-sm-3" for="loadedittrackFile" data-i18n="trackasroute.file"
+                            <div class="form-group row">
+                                <label
+                                    class="col-form-label col-sm-3"
+                                    for="loadedittrackFile"
+                                    data-i18n="trackasroute.file"
                                     >Trackfile</label
                                 >
-                                <div class="custom-control custom-file col-sm-8">
-                                    <input
-                                        type="file"
-                                        accept=".gpx,.kml,.geojson,*.*"
-                                        name="loadedittrackFile"
-                                        id="loadedittrackFile"
-                                        class="custom-file-input"
-                                    />
-                                    <label
-                                        for="loadedittrackFile"
-                                        class="custom-file-label"
-                                        style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
-                                    >
-                                    </label
-                                    ><br />
+                                <div class="col-sm-9">
+                                    <div class="custom-control custom-file">
+                                        <input
+                                            type="file"
+                                            accept=".gpx,.kml,.geojson,*.*"
+                                            name="loadedittrackFile"
+                                            id="loadedittrackFile"
+                                            class="custom-file-input"
+                                        />
+                                        <label
+                                            for="loadedittrackFile"
+                                            class="custom-file-label"
+                                            data-i18n="[data-browse]trackasroute.browse"
+                                            style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
+                                        >
+                                        </label
+                                        ><br />
+                                    </div>
                                 </div>
                             </div>
 
-                            <div class="form-group row mt-4">
-                                <label class="col-sm-3" for="cb_showtracklayer" data-i18n="trackasroute.tracklayer"
+                            <div class="form-group row">
+                                <label
+                                    class="col-form-label col-sm-3"
+                                    for="cb_showtracklayer"
+                                    data-i18n="trackasroute.tracklayer"
                                     >Track Layer</label
                                 >
-                                <div class="custom-control custom-switch">
-                                    <input
-                                        type="checkbox"
-                                        class="custom-control-input"
-                                        id="cb_showtracklayer"
-                                        checked="checked"
-                                    />
-                                    <label
-                                        class="custom-control-label"
-                                        for="cb_showtracklayer"
-                                        data-i18n="trackasroute.explaintracklayer"
-                                        >(show Track as separate Layer)</label
-                                    >
+                                <div class="col-sm-9">
+                                    <div class="custom-control custom-switch">
+                                        <input
+                                            type="checkbox"
+                                            class="custom-control-input"
+                                            id="cb_showtracklayer"
+                                            checked="checked"
+                                        />
+                                        <label
+                                            class="custom-control-label"
+                                            for="cb_showtracklayer"
+                                            data-i18n="trackasroute.explaintracklayer"
+                                            >(show Track as separate Layer)</label
+                                        >
+                                    </div>
                                 </div>
                             </div>
 
-                            <div class="form-group row mt-4">
-                                <label class="col-sm-3" for="cb_showpois" data-i18n="trackasroute.showpois"
+                            <div class="form-group row">
+                                <label
+                                    class="col-form-label col-sm-3"
+                                    for="cb_showpois"
+                                    data-i18n="trackasroute.showpois"
                                     >POI's</label
                                 >
-                                <div class="custom-control custom-switch">
-                                    <input
-                                        type="checkbox"
-                                        class="custom-control-input"
-                                        id="cb_showpois"
-                                        checked="checked"
-                                    />
-                                    <label
-                                        class="custom-control-label"
-                                        for="cb_showpois"
-                                        data-i18n="trackasroute.explainpoi"
-                                        >(show waypoints as POI's)</label
-                                    >
+                                <div class="col-sm-9">
+                                    <div class="custom-control custom-switch">
+                                        <input
+                                            type="checkbox"
+                                            class="custom-control-input"
+                                            id="cb_showpois"
+                                            checked="checked"
+                                        />
+                                        <label
+                                            class="custom-control-label"
+                                            for="cb_showpois"
+                                            data-i18n="trackasroute.explainpoi"
+                                            >(show waypoints as POI's)</label
+                                        >
+                                    </div>
                                 </div>
                             </div>
 
@@ -693,17 +649,19 @@
                                             for="simplify_tolerance"
                                             class="col-sm-3"
                                             data-i18n="trackasroute.fuzziness"
-                                            >fuzziness</label
+                                            >Fuzziness</label
                                         >
-                                        <input
-                                            type="range"
-                                            class="custom-range col-sm-8"
-                                            id="simplify_tolerance"
-                                            min="-500"
-                                            max="500"
-                                            step="any"
-                                            value="0"
-                                        />
+                                        <div class="col-sm-9">
+                                            <input
+                                                type="range"
+                                                class="custom-range"
+                                                id="simplify_tolerance"
+                                                min="-500"
+                                                max="500"
+                                                step="any"
+                                                value="0"
+                                            />
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -715,26 +673,142 @@
                             >
                                 Please wait!
                             </div>
-                            <div class="modal-footer mt-4">
-                                <button
-                                    type="button"
-                                    class="btn btn-secondary"
-                                    data-i18n="modal.close"
-                                    data-dismiss="modal"
-                                >
-                                    Close
-                                </button>
-                                <button
-                                    type="button"
-                                    class="btn btn-primary"
-                                    data-i18n="trackasroute.title"
-                                    id="submitLoadEditTrack"
-                                >
-                                    Import Track
-                                </button>
-                            </div>
                         </form>
                     </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-i18n="modal.close" data-dismiss="modal">
+                            Close
+                        </button>
+                        <button
+                            type="submit"
+                            class="btn btn-primary"
+                            form="loadedittrackForm"
+                            data-i18n="trackasroute.title"
+                            id="submitLoadEditTrack"
+                        >
+                            Import Track
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Load nogos modal window -->
+        <div
+            class="modal fade"
+            id="loadNogos"
+            tabindex="-1"
+            role="dialog"
+            aria-labelledby="Load nogos window"
+            aria-hidden="true"
+        >
+            <div class="modal-dialog modal-lg modal-fullscreen-md-down" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title" data-i18n="loadNogos.title">Load no-go areas</h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <p id="nogoError" class="invalid-feedback" style="display: none"></p>
+                        <form name="loadNogosForm" id="loadNogosForm">
+                            <fieldset>
+                                <legend data-i18n="loadNogos.source">Source</legend>
+                                <div>
+                                    <input type="text" id="nogoJSON" hidden />
+                                    <div class="form-group row">
+                                        <label for="nogoURL" class="col-form-label col-sm-3" data-i18n="loadNogos.url"
+                                            >URL</label
+                                        >
+                                        <div class="col-sm-9">
+                                            <input type="text" name="nogoURL" id="nogoURL" />
+                                        </div>
+                                    </div>
+                                    <p data-i18n="modal.or">or</p>
+                                    <div class="form-group row">
+                                        <label class="col-form-label col-sm-3" for="nogoFile" data-i18n="loadNogos.file"
+                                            >File (.geojson)</label
+                                        >
+                                        <div class="col-sm-9">
+                                            <div class="custom-control custom-file">
+                                                <input
+                                                    type="file"
+                                                    accept=".geojson"
+                                                    name="nogoFile"
+                                                    id="nogoFile"
+                                                    class="custom-file-input"
+                                                />
+                                                <label
+                                                    for="nogoFile"
+                                                    class="custom-file-label"
+                                                    data-i18n="[data-browse]trackasroute.browse"
+                                                    style="
+                                                        white-space: nowrap;
+                                                        overflow: hidden;
+                                                        text-overflow: ellipsis;
+                                                    "
+                                                >
+                                                </label
+                                                ><br />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </fieldset>
+                            <fieldset>
+                                <legend data-i18n="loadNogos.defaultProperties">Default properties</legend>
+                                <div class="form-group row">
+                                    <label
+                                        class="col-form-label col-sm-8"
+                                        for="nogoWeight"
+                                        data-i18n="loadNogos.nogoWeight"
+                                        >No-go weight (-1 means impassable):
+                                    </label>
+                                    <div class="col-sm-3">
+                                        <input type="number" name="nogoWeight" id="nogoWeight" value="-1" min="-1" />
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label
+                                        class="col-form-label col-sm-8"
+                                        for="nogoRadius"
+                                        data-i18n="loadNogos.nogoRadius"
+                                        >No-go radius for points (in meters):
+                                    </label>
+                                    <div class="col-sm-3">
+                                        <input type="number" name="nogoRadius" id="nogoRadius" value="20" min="0" />
+                                    </div>
+                                </div>
+                                <div class="form-group row">
+                                    <label
+                                        class="col-form-label col-sm-8"
+                                        for="nogoBuffer"
+                                        data-i18n="loadNogos.nogoBuffer"
+                                        >Buffer no-go areas (in meters):
+                                    </label>
+                                    <div class="col-sm-3">
+                                        <input type="number" name="nogoBuffer" id="nogoBuffer" value="0" min="0" />
+                                    </div>
+                                </div>
+                            </fieldset>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-i18n="modal.close" data-dismiss="modal">
+                            Close
+                        </button>
+
+                        <button
+                            type="submit"
+                            class="btn btn-primary"
+                            form="loadNogosForm"
+                            data-i18n="loadNogos.load"
+                            id="submitNogos"
+                        >
+                            Load
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>
@@ -763,7 +837,7 @@
                                 class="fa"
                                 width="1em"
                                 height="1em"
-                                viewBox="0 0 24 24"
+                                viewbox="0 0 24 24"
                                 fill="none"
                                 stroke="currentColor"
                                 stroke-width="2.2"
@@ -837,7 +911,11 @@
 
             <div class="leaflet-sidebar-flex-row flexgrow">
                 <div id="map" class="leaflet-sidebar-map">
-                    <div id="message"></div>
+                    <div id="notification_jar">
+                        <div id="message"></div>
+                        <div id="whats_new_message"></div>
+                        <div id="overpass_loading_indicator"></div>
+                    </div>
                     <div id="preview" hidden data-i18n="map.preview">Preview</div>
                 </div>
 
@@ -846,7 +924,8 @@
                         <div class="leaflet-sidebar-pane" id="tab_layers_control">
                             <h1 class="leaflet-sidebar-header">
                                 <span class="leaflet-sidebar-close"><i class="fa fa-caret-right"></i></span
-                                ><span class="leaflet-sidebar-expand"><i class="fa fa-expand"></i></span
+                                ><span class="d-none d-md-block leaflet-sidebar-expand"
+                                    ><i class="fa fa-expand"></i></span
                                 ><span data-i18n="sidebar.layers.title">Layers</span>
                             </h1>
                             <div id="layers-control-wrapper"></div>
@@ -910,7 +989,8 @@
                         <div class="leaflet-sidebar-pane" id="tab_profile">
                             <h1 class="leaflet-sidebar-header">
                                 <span class="leaflet-sidebar-close"><i class="fa fa-caret-right"></i></span
-                                ><span class="leaflet-sidebar-expand"><i class="fa fa-expand"></i></span
+                                ><span class="d-none d-md-block leaflet-sidebar-expand"
+                                    ><i class="fa fa-expand"></i></span
                                 ><span data-i18n="sidebar.customize-profile.title">Customize profile</span>
                             </h1>
                             <form class="flexcolumn flexgrow">
@@ -951,7 +1031,7 @@
                                         aria-labelledby="params-tab"
                                     >
                                         <div id="profile_params"></div>
-                                        <div class="form-group" id="profile_buttons">
+                                        <div class="form-group pt-1">
                                             <button id="save" type="button" class="btn btn-primary btn-sm">
                                                 <span class="fa fa-cloud-upload"></span>
                                                 <span data-i18n="sidebar.profile.apply">Apply</span>
@@ -973,7 +1053,7 @@
                                             placeholder="Write your custom profile here."
                                         ></textarea>
                                         <div id="profile_message"></div>
-                                        <div class="form-group" id="profile_buttons">
+                                        <div class="form-group pt-1">
                                             <button id="upload" type="button" class="btn btn-primary btn-sm">
                                                 <span class="fa fa-cloud-upload"></span>
                                                 <span data-i18n="sidebar.profile.apply">Apply</span>
@@ -998,7 +1078,9 @@
                         <div class="leaflet-sidebar-pane" id="tab_data">
                             <h1 class="leaflet-sidebar-header">
                                 <span class="leaflet-sidebar-close"><i class="fa fa-caret-right"></i></span>
-                                <span class="leaflet-sidebar-expand"><i class="fa fa-expand"></i></span>
+                                <span class="d-none d-md-block leaflet-sidebar-expand"
+                                    ><i class="fa fa-expand"></i
+                                ></span>
                                 <span
                                     id="data-sync-map"
                                     class="sync-map active"
@@ -1015,7 +1097,9 @@
                             <h1 class="leaflet-sidebar-header">
                                 <span data-i18n="sidebar.itinerary.title">Itinerary</span
                                 ><span class="leaflet-sidebar-close"><i class="fa fa-caret-right"></i></span
-                                ><span class="leaflet-sidebar-expand"><i class="fa fa-expand"></i></span>
+                                ><span class="d-none d-md-block leaflet-sidebar-expand"
+                                    ><i class="fa fa-expand"></i
+                                ></span>
                             </h1>
                             <div id="itinerary" class="flexcolumn flexgrow"></div>
                         </div>
@@ -1143,7 +1227,7 @@
         <script>
             // global package prefix for BRouter web application
             BR = {};
-            BR.version = '0.15.1';
+            BR.version = '0.16.0';
 
             console.log(
                 '\r\n###\r\n###  BRouter-Web\r\n###\r\n###  Please note that the routing API used here is not public!\r\n###\r\n'
diff --git a/js/LayersConfig.js b/js/LayersConfig.js
index a3b497b..7ef4266 100644
--- a/js/LayersConfig.js
+++ b/js/LayersConfig.js
@@ -1,4 +1,5 @@
 BR.LayersConfig = L.Class.extend({
+    overpassFrontend: new OverpassFrontend(BR.conf.overpassBaseUrl || '//overpass-api.de/api/interpreter'),
     defaultBaseLayers: BR.confLayers.defaultBaseLayers,
     defaultOverlays: BR.confLayers.defaultOverlays,
     legacyNameToIdMap: BR.confLayers.legacyNameToIdMap,
@@ -7,6 +8,8 @@ BR.LayersConfig = L.Class.extend({
 
     initialize: function (map) {
         this._map = map;
+        this._overpassLoadingIndicator = new BR.Message('overpass_loading_indicator', { alert: false });
+        this._overpassActiveRequestCount = 0;
 
         this._addLeafletProvidersLayers();
         this._customizeLayers();
@@ -169,6 +172,70 @@ BR.LayersConfig = L.Class.extend({
         return result;
     },
 
+    _showOverpassLoadingIndicator: function () {
+        this._overpassActiveRequestCount++;
+        this._overpassLoadingIndicator.showLoading(i18next.t('layers.overpass-loading-indicator'));
+    },
+
+    _hideOverpassLoadingIndicator: function () {
+        if (--this._overpassActiveRequestCount === 0) {
+            this._overpassLoadingIndicator.hide();
+        }
+    },
+
+    getOverpassIconUrl: function (icon) {
+        const iconPrefix = /^(maki|temaki|fas)-/;
+        let iconUrl = null;
+
+        if (icon && iconPrefix.test(icon)) {
+            const iconName = icon.replace(iconPrefix, '');
+            const postfix = icon.startsWith('maki-') ? '-11' : '';
+            iconUrl = `dist/images/${iconName}${postfix}.svg`;
+        }
+
+        return iconUrl;
+    },
+
+    createOverpassLayer: function (query, icon) {
+        let markerSign = '<i class="fa fa-search icon-white" style="width: 25px;"></i>';
+
+        const iconUrl = this.getOverpassIconUrl(icon);
+        if (iconUrl) {
+            markerSign = `<img class="icon-invert" src="${iconUrl}" width="11" />`;
+        }
+
+        return Object.assign(
+            new OverpassLayer({
+                overpassFrontend: this.overpassFrontend,
+                query: query,
+                minZoom: 12,
+                feature: {
+                    title: '{{ tags.name }}',
+                    body:
+                        '<table class="overpass-tags">{% for k, v in tags %}{% if k[:5] != "addr:" %}<tr><th>{{ k }}</th><td>{% if k matches "/email/" %}<a href="mailto:{{ v }}">{{ v }}</a>{% elseif v matches "/^http/" %}<a href="{{ v }}">{{ v }}</a>{% elseif v matches "/^www/" %}<a href="http://{{ v }}">{{ v }}</a>{% else %}{{ v }}{% endif %}</td></tr>{% endif %}{% endfor %}</table>',
+                    markerSymbol:
+                        '<svg width="25px" height="41px" anchorX="12" anchorY="41" viewBox="0 0 32 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M16,1 C7.7146,1 1,7.65636364 1,15.8648485 C1,24.0760606 16,51 16,51 C16,51 31,24.0760606 31,15.8648485 C31,7.65636364 24.2815,1 16,1 L16,1 Z" fill="#436978"></path></svg>',
+                    markerSign,
+                    style: function (overpassObject) {
+                        return {
+                            // nodeFeature: 'Marker' isn't currently working well, hence use transparent circle color for nodes
+                            color:
+                                overpassObject.type === 'node'
+                                    ? '#00000000'
+                                    : this.defaultBaseLayers?.[0] === 'cyclosm'
+                                    ? 'darkorange'
+                                    : '#3388ff',
+                        };
+                    }.bind(this),
+                },
+            }),
+            {
+                onLoadStart: this._showOverpassLoadingIndicator.bind(this),
+                onLoadEnd: this._hideOverpassLoadingIndicator.bind(this),
+            }
+        );
+    },
+
     createLayer: function (layerData) {
         var props = layerData.properties;
         var url = props.url;
@@ -251,6 +318,8 @@ BR.LayersConfig = L.Class.extend({
             if (props.subdomains) {
                 layer.subdomains = props.subdomains;
             }
+        } else if (props.dataSource === 'OverpassAPI') {
+            layer = this.createOverpassLayer(props.query, props.icon);
         } else {
             // JOSM
             var josmUrl = url;
diff --git a/js/Map.js b/js/Map.js
index d772e11..2995a36 100644
--- a/js/Map.js
+++ b/js/Map.js
@@ -56,6 +56,10 @@ BR.Map = {
 
         $('#credits').on('show.bs.modal', function (event) {
             BR.Map._renderLayerCredits(layersControl._layers);
+            const overpassUrl = new URL(BR.conf.overpassBaseUrl || 'https://overpass-api.de').origin;
+            for (const link of document.getElementsByClassName('overpass-url')) {
+                link.href = overpassUrl;
+            }
         });
 
         new L.Control.PermalinkAttribution().addTo(map);
diff --git a/js/WhatsNew.js b/js/WhatsNew.js
index 2010b2d..0e3b1b8 100644
--- a/js/WhatsNew.js
+++ b/js/WhatsNew.js
@@ -1,18 +1,30 @@
 BR.WhatsNew = {
+    newOnly: undefined,
+
     init: function () {
         var self = this;
-        self.prepare(self.hasNewVersions());
+        self.dismissableMessage = new BR.Message('whats_new_message', {
+            onClosed: function () {
+                document.getElementsByClassName('version')[0].classList.remove('version-new');
+                if (BR.Util.localStorageAvailable()) {
+                    localStorage.setItem('changelogVersion', self.getLatestVersion());
+                }
+            },
+        });
+        $('#whatsnew').on('shown.bs.modal', function () {
+            self.dismissableMessage.hide();
+        });
         $('#whatsnew').on('hidden.bs.modal', function () {
-            localStorage.setItem('changelogVersion', self.getLatestVersion());
             // next time popup is open, by default we will see everything
             self.prepare(false);
         });
-        $('#whatsnew').on('shown.bs.modal', function () {
-            BR.message.hide();
-            document.getElementsByClassName('version')[0].classList.remove('version-new');
-        });
+        if (!self.getCurrentVersion() && BR.Util.localStorageAvailable()) {
+            localStorage.setItem('changelogVersion', self.getLatestVersion());
+        }
+        self.prepare(self.hasNewVersions());
+
         if (self.hasNewVersions()) {
-            BR.message.showInfo(i18next.t('whatsnew.new-version'));
+            self.dismissableMessage.showInfo(i18next.t('whatsnew.new-version'));
             document.getElementsByClassName('version')[0].classList.add('version-new');
         }
     },
@@ -21,21 +33,28 @@ BR.WhatsNew = {
         return BR.changelog.match('<h2 id="(.*)">')[1];
     },
 
+    getCurrentVersion: function () {
+        if (!BR.Util.localStorageAvailable()) return null;
+
+        return localStorage.getItem('changelogVersion');
+    },
+
     hasNewVersions: function () {
-        if (!BR.Util.localStorageAvailable()) return false;
-
-        var currentVersion = localStorage.getItem('changelogVersion');
-
-        return !currentVersion || currentVersion < this.getLatestVersion();
+        return this.getCurrentVersion() && this.getCurrentVersion() !== this.getLatestVersion();
     },
 
     prepare: function (newOnly) {
-        var currentVersion = localStorage.getItem('changelogVersion');
+        if (newOnly === this.newOnly) {
+            // do not rebuild modal content unnecessarily
+            return;
+        }
+        this.newOnly = newOnly;
         var container = document.querySelector('#whatsnew .modal-body');
         var cl = BR.changelog;
-        if (newOnly && currentVersion) {
-            var head = '<h2 id="' + currentVersion + '">';
-            cl = cl.substring(0, cl.indexOf(head));
+        if (newOnly && this.getCurrentVersion()) {
+            var head = '<h2 id="' + this.getCurrentVersion() + '">';
+            var idx = cl.indexOf(head);
+            if (idx >= 0) cl = cl.substring(0, idx);
         }
         container.innerHTML = cl;
     },
diff --git a/js/control/Export.js b/js/control/Export.js
index 3a9ce21..5ec4a5e 100644
--- a/js/control/Export.js
+++ b/js/control/Export.js
@@ -148,6 +148,10 @@ BR.Export = L.Class.extend({
         }
     },
 
+    _selectTrackname: function () {
+        trackname.setSelectionRange(0, trackname.value.lastIndexOf(BR.Browser.download ? ' (' : ' - '));
+    },
+
     _generateTrackname: function () {
         var trackname = this.trackname;
         this._getCityAtPosition(
@@ -180,6 +184,8 @@ BR.Export = L.Class.extend({
                             trackname.value = trackname.value.replace(/[>)]/g, '').replace(/ \(/g, ' - ');
                             this._validationMessage();
                         }
+
+                        this._selectTrackname();
                     }, this)
                 );
             }, this)
diff --git a/js/control/Layers.js b/js/control/Layers.js
index fb1e581..a85ef3b 100644
--- a/js/control/Layers.js
+++ b/js/control/Layers.js
@@ -5,7 +5,7 @@ BR.Layers = L.Class.extend({
         if (BR.Util.localStorageAvailable()) {
             var layers = JSON.parse(localStorage.getItem('map/customLayers'));
             for (a in layers) {
-                this._addLayer(a, layers[a].layer, layers[a].isOverlay);
+                this._addLayer(a, layers[a].layer, layers[a].isOverlay, layers[a].dataSource);
             }
         }
     },
@@ -13,14 +13,22 @@ BR.Layers = L.Class.extend({
     _loadTable: function () {
         var layersData = [];
         for (layer in this._customLayers) {
-            var isOverlay = this._customLayers[layer].isOverlay;
-            layersData.push([
-                layer,
-                this._customLayers[layer].layer._url,
-                isOverlay
-                    ? i18next.t('sidebar.layers.table.type_overlay')
-                    : i18next.t('sidebar.layers.table.type_layer'),
-            ]);
+            if (this._customLayers[layer].dataSource === 'OverpassAPI') {
+                layersData.push([
+                    layer,
+                    this._customLayers[layer].layer.options.query,
+                    i18next.t('sidebar.layers.table.type_overpass_query'),
+                ]);
+            } else {
+                var isOverlay = this._customLayers[layer].isOverlay;
+                layersData.push([
+                    layer,
+                    this._customLayers[layer].layer._url,
+                    isOverlay
+                        ? i18next.t('sidebar.layers.table.type_overlay')
+                        : i18next.t('sidebar.layers.table.type_layer'),
+                ]);
+            }
         }
         if (this._layersTable != null) {
             this._layersTable.destroy();
@@ -51,6 +59,7 @@ BR.Layers = L.Class.extend({
 
         L.DomUtil.get('custom_layers_add_base').onclick = L.bind(this._addBaseLayer, this);
         L.DomUtil.get('custom_layers_add_overlay').onclick = L.bind(this._addOverlay, this);
+        L.DomUtil.get('custom_layers_add_overpass').onclick = L.bind(this._addOverpassQuery, this);
         L.DomUtil.get('custom_layers_remove').onclick = L.bind(this._remove, this);
 
         this._loadLayers();
@@ -83,10 +92,10 @@ BR.Layers = L.Class.extend({
         }
     },
 
-    _addFromInput: function (isOverlay) {
+    _addFromInput: function (isOverlay, dataSource) {
         var layer_name = L.DomUtil.get('layer_name').value;
         var layer_url = L.DomUtil.get('layer_url').value;
-        if (layer_name.length > 0 && layer_url.length > 0) this._addLayer(layer_name, layer_url, isOverlay);
+        if (layer_name.length > 0 && layer_url.length > 0) this._addLayer(layer_name, layer_url, isOverlay, dataSource);
     },
 
     _addBaseLayer: function (evt) {
@@ -95,18 +104,28 @@ BR.Layers = L.Class.extend({
     _addOverlay: function (evt) {
         this._addFromInput(true);
     },
+    _addOverpassQuery: function (evt) {
+        this._addFromInput(true, 'OverpassAPI');
+    },
 
-    _addLayer: function (layerName, layerUrl, isOverlay) {
+    _addLayer: function (layerName, layerUrl, isOverlay, dataSource) {
         if (layerName in this._layers) return;
 
         if (layerName in this._customLayers) return;
 
         try {
-            var layer = L.tileLayer(layerUrl);
+            var layer;
+
+            if (dataSource === 'OverpassAPI') {
+                layer = this._layersControl.layersConfig.createOverpassLayer(layerUrl);
+            } else {
+                layer = L.tileLayer(layerUrl);
+            }
 
             this._customLayers[layerName] = {
                 layer: layer,
                 isOverlay: isOverlay,
+                dataSource: dataSource,
             };
 
             if (isOverlay) {
@@ -128,6 +147,18 @@ BR.Layers = L.Class.extend({
             localStorage.setItem(
                 'map/customLayers',
                 JSON.stringify(this._customLayers, function (k, v) {
+                    if (v === undefined) {
+                        return undefined;
+                    }
+
+                    if (v.dataSource === 'OverpassAPI') {
+                        return {
+                            dataSource: 'OverpassAPI',
+                            isOverlay: true,
+                            layer: v.layer.options.query,
+                        };
+                    }
+
                     // dont write Leaflet.Layer in localStorage; simply keep the URL
                     return v._url || v;
                 })
diff --git a/js/control/LayersTab.js b/js/control/LayersTab.js
index 922a067..2108f62 100644
--- a/js/control/LayersTab.js
+++ b/js/control/LayersTab.js
@@ -170,7 +170,7 @@ BR.LayersTab = BR.ControlLayers.extend({
                 core: {
                     multiple: false,
                     themes: {
-                        icons: false,
+                        icons: true,
                         dots: false,
                     },
                     data: treeData,
@@ -188,6 +188,7 @@ BR.LayersTab = BR.ControlLayers.extend({
         function createRootNode(name) {
             var rootNode = {
                 text: i18next.t('sidebar.layers.category.' + name, name),
+                icon: false,
                 state: {
                     disabled: true,
                 },
@@ -218,6 +219,7 @@ BR.LayersTab = BR.ControlLayers.extend({
                 childNode = {
                     id: id,
                     text: getText(props, parent),
+                    icon: self.layersConfig.getOverpassIconUrl(props.icon) || false,
                     state: {
                         checked: self.layersConfig.isDefaultLayer(id, props.overlay),
                     },
diff --git a/js/control/Message.js b/js/control/Message.js
index 2867dd2..497204f 100644
--- a/js/control/Message.js
+++ b/js/control/Message.js
@@ -3,6 +3,7 @@ BR.Message = L.Class.extend({
         // true to manually attach click event to close button,
         // Bootstrap data-api's auto-initialization doesn't work in Controls because of stopPropagation
         alert: false,
+        onClosed: null,
     },
 
     initialize: function (id, options) {
@@ -18,12 +19,20 @@ BR.Message = L.Class.extend({
             case 'error':
                 iconClass = 'fa-times-circle';
                 alertClass = 'alert-danger';
+                break;
             case 'warning':
                 iconClass = 'fa-exclamation-triangle';
                 alertClass = 'alert-warning';
+                break;
+            case 'loading':
+                iconClass = 'fa-spinner fa-pulse';
+                alertClass = 'alert-secondary';
+                break;
+            default:
             case 'info':
                 iconClass = 'fa-info-circle';
                 alertClass = 'alert-info';
+                break;
         }
 
         L.DomEvent.disableClickPropagation(ele);
@@ -41,6 +50,10 @@ BR.Message = L.Class.extend({
             msg +
             '</div>';
 
+        if (this.options.onClosed) {
+            $('#' + this.id + ' .alert').on('closed.bs.alert', this.options.onClosed);
+        }
+
         if (this.options.alert) {
             $('#' + this.id + ' .alert').alert();
         }
@@ -74,6 +87,10 @@ BR.Message = L.Class.extend({
     showInfo: function (msg) {
         this._show(msg, 'info');
     },
+
+    showLoading: function (msg) {
+        this._show(msg, 'loading');
+    },
 });
 
 // static instance as global control
diff --git a/js/index.js b/js/index.js
index b9a4dd5..8ef2fd3 100644
--- a/js/index.js
+++ b/js/index.js
@@ -153,6 +153,9 @@
                     },
                 ],
                 value: ['route'],
+                onShown: function () {
+                    $('button.bootbox-accept', $(this)).focus();
+                },
                 callback: function (result) {
                     if (result !== null) {
                         if (result.indexOf('route') !== -1) {
@@ -454,6 +457,10 @@
         );
 
         BR.WhatsNew.init();
+
+        $('.modal').on('shown.bs.modal', function (e) {
+            $('input:visible:enabled:first', e.target).focus();
+        });
     }
 
     i18next.on('languageChanged', function (detectedLanguage) {
diff --git a/js/plugin/CircleGoArea.js b/js/plugin/CircleGoArea.js
index a17250f..78939d3 100644
--- a/js/plugin/CircleGoArea.js
+++ b/js/plugin/CircleGoArea.js
@@ -11,7 +11,7 @@ BR.CircleGoArea = L.Control.extend({
     options: {
         countriesUrl: BR.conf.countriesUrl || 'dist/boundaries/countries.topo.json',
         statesUrl: BR.conf.statesUrl || 'dist/boundaries/germany-states.topo.json',
-        overpassBaseUrl: BR.conf.overpassBaseUrl || 'https://overpass-api.de/api/interpreter?data=',
+        overpassDataUrl: (BR.conf.overpassBaseUrl || 'https://overpass-api.de/api/interpreter') + '?data=',
         shortcut: {
             draw: {
                 enable: 73, // char code for 'i'
@@ -137,7 +137,7 @@ BR.CircleGoArea = L.Control.extend({
             query += '(area.a[admin_level="' + adminLevelFallback + '"];)->.p; relation(pivot.p); out geom;';
         }
 
-        var url = this.options.overpassBaseUrl + encodeURIComponent(query);
+        var url = this.options.overpassDataUrl + encodeURIComponent(query);
 
         this.marker.setIcon(this.iconSpinner);
         BR.Util.getJson(
@@ -281,7 +281,7 @@ BR.CircleGoArea = L.Control.extend({
                     this._applyStateRules(center);
                 }
             } else if (name === 'Metropolitan France') {
-                this.radius = 20000;
+                this.radius = 10000;
                 this._setNogoCircle(center);
             } else {
                 console.error('unhandled country: ' + name);
diff --git a/js/plugin/NogoAreas.js b/js/plugin/NogoAreas.js
index db50761..5f18e9c 100644
--- a/js/plugin/NogoAreas.js
+++ b/js/plugin/NogoAreas.js
@@ -5,6 +5,7 @@ BR.NogoAreas = L.Control.extend({
                 enable: 78, // char code for 'n'
                 disable: 27, // char code for 'ESC'
             },
+            import: 78, // char code for 'n'; used in conjunction with 'shift'
         },
     },
 
@@ -97,6 +98,8 @@ BR.NogoAreas = L.Control.extend({
 
         L.DomEvent.addListener(document, 'keydown', this._keydownListener, this);
 
+        L.DomUtil.get('nogoFile').onchange = L.bind(this.onFileChanged, this);
+
         this.editTools.on(
             'editable:drawing:end',
             function (e) {
@@ -147,6 +150,13 @@ BR.NogoAreas = L.Control.extend({
         if (!BR.Util.keyboardShortcutsAllowed(e)) {
             return;
         }
+
+        if (true === e.shiftKey && e.keyCode === this.options.shortcut.import) {
+            $('#loadNogos').modal('show');
+
+            return;
+        }
+
         if (e.keyCode === this.options.shortcut.draw.disable && this.button.state() === BR.NogoAreas.STATE_CANCEL) {
             this.stopDrawing(this.button);
         } else if (
@@ -162,6 +172,11 @@ BR.NogoAreas = L.Control.extend({
         $('#nogoError').css('display', message ? 'block' : 'none');
     },
 
+    onFileChanged: function (e) {
+        if (!e.target.files[0]) return;
+        $(e.target).next('label').text(e.target.files[0].name);
+    },
+
     uploadNogos: function () {
         var self = this;
 
diff --git a/js/plugin/RouteLoaderConverter.js b/js/plugin/RouteLoaderConverter.js
index 1c0b357..53967c7 100644
--- a/js/plugin/RouteLoaderConverter.js
+++ b/js/plugin/RouteLoaderConverter.js
@@ -15,6 +15,9 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
             simplifyTolerance: -1,
             isTestMode: false,
             simplifyLastKnownGood: 0.001,
+            shortcut: {
+                open: 79, // char code for 'O'; used in conjunction with 'shift'
+            },
         },
 
         setDialogDraggable: function (jqDlgHeader) {
@@ -84,12 +87,14 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
             (this._bounds = undefined), (this._trackPoints = []);
             this._currentGeoJSON = {};
             this._options = {
-                ext: 'gpx',
                 showTrackLayer: true,
                 showPointAsPoi: true,
                 simplifyTolerance: -1,
                 isTestMode: false,
                 simplifyLastKnownGood: 0.001,
+                shortcut: {
+                    open: 79, // char code for 'O'; used in conjunction with 'shift'
+                },
             };
         },
 
@@ -156,13 +161,13 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
             if (typeof isBusy === undefined) {
                 isBusy = false;
             }
-            if (isBusy === true) $('#loadedittrackdlg #msg_busy').removeClass('invisible');
-            else $('#loadedittrackdlg #msg_busy').addClass('invisible');
+            if (isBusy === true) $('#loadedittrack #msg_busy').removeClass('invisible');
+            else $('#loadedittrack #msg_busy').addClass('invisible');
         },
 
         onManualCollapse: function (e) {
             //workaround for starting with closed collapse
-            if ($('#loadedittrackdlg').is(':hidden')) return;
+            if ($('#loadedittrack').is(':hidden')) return;
             this._options.isTestMode = $(e.target).hasClass('show');
 
             if (this._options.isTestMode) {
@@ -172,13 +177,13 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
         },
 
         onAdd: function (map) {
-            $('#loadedittrackdlg').on(
+            $('#loadedittrack').on(
                 'hidden.bs.modal',
                 function (e) {
                     this.cleanup();
                 }.bind(this)
             );
-            $('#loadedittrackdlg').on(
+            $('#loadedittrack').on(
                 'show.bs.modal',
                 function (e) {
                     $('#manual_collapse').collapse('hide');
@@ -186,7 +191,8 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
                 }.bind(this)
             );
 
-            L.DomUtil.get('submitLoadEditTrack').onclick = L.bind(function () {
+            L.DomUtil.get('submitLoadEditTrack').onclick = L.bind(function (e) {
+                e.preventDefault(); // prevent page reload on form submission
                 this._closeCanceled = false;
                 this.onBusyChanged(true);
                 if (this._testLayer.getLayers().length > 0) {
@@ -195,7 +201,7 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
                         function () {
                             this.addRoutingPoints();
                             this.onBusyChanged(false);
-                            $('#loadedittrackdlg').modal('hide');
+                            $('#loadedittrack').modal('hide');
                         }.bind(this),
                         0
                     );
@@ -203,7 +209,7 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
                     setTimeout(
                         function () {
                             this.convertTrackLocal();
-                            $('#loadedittrackdlg').modal('hide');
+                            $('#loadedittrack').modal('hide');
                         }.bind(this),
                         0
                     );
@@ -214,7 +220,7 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
             L.DomUtil.get('loadedittrackFile').onchange = L.bind(this.onFileChanged, this);
             this.onFileChanged({ target: L.DomUtil.get('loadedittrackFile') });
 
-            this.setDialogDraggable($('#loadedittrackdlg .modal-header'));
+            this.setDialogDraggable($('#loadedittrack .modal-header'));
 
             $('#manual_collapse').collapse('hide');
             $('#manual_collapse').on(
@@ -224,6 +230,8 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
                 }.bind(this)
             );
 
+            L.DomEvent.addListener(document, 'keydown', this.keydownListener, this);
+
             // dummy, no own representation, delegating to EasyButton
             var dummy = L.DomUtil.create('div');
             dummy.hidden = true;
@@ -382,6 +390,16 @@ BR.routeLoader = function (map, layersControl, routing, pois) {
 
             this.onBusyChanged(false);
         },
+
+        keydownListener: function (e) {
+            if (
+                BR.Util.keyboardShortcutsAllowed(e) &&
+                e.keyCode === this._options.shortcut.open &&
+                true === e.shiftKey
+            ) {
+                $('#navbarLoadEditTracks').click();
+            }
+        },
     });
 
     RouteLoader.include(L.Evented.prototype);
diff --git a/js/plugin/Search.js b/js/plugin/Search.js
index c56e6df..e810867 100644
--- a/js/plugin/Search.js
+++ b/js/plugin/Search.js
@@ -1,29 +1,29 @@
-BR.Search = L.Control.Geocoder.extend({
-    options: {
-        geocoder: new L.Control.Geocoder.LatLng({
-            next: new L.Control.Geocoder.Nominatim({
-                serviceUrl: 'https://nominatim.openstreetmap.org/',
-            }),
-            sizeInMeters: 800,
-        }),
-        position: 'topleft',
-        shortcut: {
-            search: 70, // char code for 'f'
-        },
-    },
-
-    initialize: function (options) {
-        L.Control.Geocoder.prototype.initialize.call(this, options);
-        L.setOptions(this, {
-            // i18next.t will only return 'undefined' if it is called in a static context
-            // (e.g. when added directly to "options:" above), so we have to call it here
-            placeholder: i18next.t('map.geocoder-placeholder'),
-        });
+BR.Search = class extends L.Control.Geocoder {
+    constructor(options) {
+        super(
+            Object.assign(
+                {
+                    geocoder: new L.Control.Geocoder.LatLng({
+                        next: new L.Control.Geocoder.Nominatim({
+                            serviceUrl: 'https://nominatim.openstreetmap.org/',
+                        }),
+                        sizeInMeters: 800,
+                    }),
+                    position: 'topleft',
+                    expand: 'click',
+                    shortcut: {
+                        search: 70, // char code for 'f'
+                    },
+                    placeholder: i18next.t('map.geocoder-placeholder'),
+                },
+                options
+            )
+        );
 
         L.DomEvent.addListener(document, 'keydown', this._keydownListener, this);
-    },
+    }
 
-    markGeocode: function (result) {
+    markGeocode(result) {
         this._map.fitBounds(result.geocode.bbox, {
             maxZoom: 17,
         });
@@ -37,18 +37,18 @@ BR.Search = L.Control.Geocoder.extend({
         }).addTo(this._map);
 
         return this;
-    },
+    }
 
-    clear: function () {
+    clear() {
         if (this._geocodeMarker) {
             this._map.removeLayer(this._geocodeMarker);
         }
-    },
+    }
 
-    _keydownListener: function (e) {
+    _keydownListener(e) {
         if (BR.Util.keyboardShortcutsAllowed(e) && e.keyCode === this.options.shortcut.search) {
-            $('#map .leaflet-control-geocoder')[0].dispatchEvent(new MouseEvent('mousedown'));
+            $('#map .leaflet-control-geocoder')[0].dispatchEvent(new MouseEvent('click'));
             e.preventDefault();
         }
-    },
-});
+    }
+};
diff --git a/js/plugin/TracksLoader.js b/js/plugin/TracksLoader.js
index 9f53401..a68990a 100644
--- a/js/plugin/TracksLoader.js
+++ b/js/plugin/TracksLoader.js
@@ -13,7 +13,7 @@ BR.tracksLoader = function (map, layersControl, routing, pois) {
             layerOptions: BR.Track.getGeoJsonOptions(layersControl),
             addToMap: false,
             // File size limit in kb (default: 1024) ?
-            fileSizeLimit: 1024,
+            fileSizeLimit: BR.conf.trackSizeLimit || 1024 * 10,
             shortcut: {
                 open: 79, // char code for 'o'
             },
@@ -61,12 +61,12 @@ BR.tracksLoader = function (map, layersControl, routing, pois) {
         },
 
         _keydownListener: function (e) {
-            if (BR.Util.keyboardShortcutsAllowed(e) && e.keyCode === this.options.shortcut.open) {
-                if (e.shiftKey) {
-                    $('#loadNogos').modal('show');
-                } else {
-                    $('#navbarLoadTracks')[0].click();
-                }
+            if (
+                BR.Util.keyboardShortcutsAllowed(e) &&
+                e.keyCode === this.options.shortcut.open &&
+                false === e.shiftKey
+            ) {
+                $('#navbarLoadTracks')[0].click();
             }
         },
     });
diff --git a/js/plugin/leaflet-fullHash.js b/js/plugin/leaflet-fullHash.js
index 6254f62..de9a950 100644
--- a/js/plugin/leaflet-fullHash.js
+++ b/js/plugin/leaflet-fullHash.js
@@ -129,6 +129,11 @@
                     L.bind(function (obj, index, array) {
                         if (obj) {
                             layersControl.activateLayer(obj);
+                            if (obj.layer instanceof OverpassLayer) {
+                                // hack to select overlay (mark checked) in the layers control
+                                // (OverpassLayer._layerAdd does not fire 'add' event)
+                                layersControl._update();
+                            }
                             if (obj && !obj.overlay) {
                                 added = true;
                             }
diff --git a/layers/config/tree.js b/layers/config/tree.js
index f277c1f..81041f0 100644
--- a/layers/config/tree.js
+++ b/layers/config/tree.js
@@ -83,5 +83,88 @@ BR.confLayers.tree = {
                 ]
             }
         ]
+    },
+    'overpass': {
+        'amenity': {
+            'financial': [
+                'atm',
+                'bank',
+            ],
+            'others': [
+                'bench',
+                'kneipp_water_cure',
+                'public_bath',
+                'shelter',
+                'shower',
+                'telephone',
+                'toilets',
+                'water_point',
+            ],
+            'sustenance': [
+                'bar',
+                'bbq',
+                'biergarten',
+                'cafe',
+                'drinking_water',
+                'fast_food',
+                'food_court',
+                'ice_cream',
+                'pub',
+                'restaurant',
+            ],
+            'transportation': [
+                'bicycle_parking',
+                'bicycle_rental',
+                'bicycle_repair_station',
+                'boat_rental',
+                'boat_sharing',
+                'bus_station',
+                'car_rental',
+                'car_sharing',
+                'car_wash',
+                'charging_station',
+                'ferry_terminal',
+                'fuel',
+                'grit_bin',
+                'motorcycle_parking',
+                'parking_entrance',
+                'parking',
+                'parking_space',
+                'taxi',
+                'vehicle_inspection',
+            ]
+        },
+        'shop': {
+            'food': [
+                'bakery',
+                'beverages',
+                'butcher',
+                'cheese',
+                'coffee',
+                'convenience',
+                'greengrocer',
+                'health_food',
+                'ice_cream_shop',
+                'organic',
+            ]
+        },
+        'tourism': [
+            'apartment',
+            'artwork',
+            'attraction',
+            'camp_site',
+            'caravan_site',
+            'chalet',
+            'gallery',
+            'guest_house',
+            'hostel',
+            'hotel',
+            'information',
+            'motel',
+            'museum',
+            'picnic_site',
+            'viewpoint',
+            'wilderness_hut',
+        ]
     }
 };
diff --git a/layers/overpass/amenity/financial/atm.geojson b/layers/overpass/amenity/financial/atm.geojson
new file mode 100644
index 0000000..ab97516
--- /dev/null
+++ b/layers/overpass/amenity/financial/atm.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "ATM",
+    "id": "atm",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-bank",
+    "query": "(nwr[amenity=atm]; nwr[amenity=bank][atm][atm!=no];);"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/financial/bank.geojson b/layers/overpass/amenity/financial/bank.geojson
new file mode 100644
index 0000000..8205170
--- /dev/null
+++ b/layers/overpass/amenity/financial/bank.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bank",
+    "id": "bank",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-bank",
+    "query": "nwr[amenity=bank];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/bench.geojson b/layers/overpass/amenity/others/bench.geojson
new file mode 100644
index 0000000..1529f1f
--- /dev/null
+++ b/layers/overpass/amenity/others/bench.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bench",
+    "id": "bench",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-bench",
+    "query": "nwr[amenity=bench];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/kneipp_water_cure.geojson b/layers/overpass/amenity/others/kneipp_water_cure.geojson
new file mode 100644
index 0000000..970ed9c
--- /dev/null
+++ b/layers/overpass/amenity/others/kneipp_water_cure.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Kneipp water cure",
+    "id": "kneipp_water_cure",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-hospital",
+    "query": "nwr[amenity=kneipp_water_cure];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/public_bath.geojson b/layers/overpass/amenity/others/public_bath.geojson
new file mode 100644
index 0000000..094ec97
--- /dev/null
+++ b/layers/overpass/amenity/others/public_bath.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Public bath",
+    "id": "public_bath",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-water",
+    "query": "nwr[amenity=public_bath];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/shelter.geojson b/layers/overpass/amenity/others/shelter.geojson
new file mode 100644
index 0000000..fc89760
--- /dev/null
+++ b/layers/overpass/amenity/others/shelter.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Shelter",
+    "id": "shelter",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-shelter",
+    "query": "nwr[amenity=shelter];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/shower.geojson b/layers/overpass/amenity/others/shower.geojson
new file mode 100644
index 0000000..eca9f2b
--- /dev/null
+++ b/layers/overpass/amenity/others/shower.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Shower",
+    "id": "shower",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-shower",
+    "query": "nwr[amenity=shower];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/telephone.geojson b/layers/overpass/amenity/others/telephone.geojson
new file mode 100644
index 0000000..752f0bc
--- /dev/null
+++ b/layers/overpass/amenity/others/telephone.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Telephone",
+    "id": "telephone",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-phone-alt",
+    "query": "nwr[amenity=telephone];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/toilets.geojson b/layers/overpass/amenity/others/toilets.geojson
new file mode 100644
index 0000000..536c253
--- /dev/null
+++ b/layers/overpass/amenity/others/toilets.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Toilets",
+    "id": "toilets",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-toilet",
+    "query": "nwr[amenity=toilets];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/others/water_point.geojson b/layers/overpass/amenity/others/water_point.geojson
new file mode 100644
index 0000000..61874b7
--- /dev/null
+++ b/layers/overpass/amenity/others/water_point.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Water point",
+    "id": "water_point",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-drinking-water",
+    "query": "nwr[amenity=water_point];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/bar.geojson b/layers/overpass/amenity/sustenance/bar.geojson
new file mode 100644
index 0000000..48853d9
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/bar.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bar",
+    "id": "bar",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-bar",
+    "query": "nwr[amenity=bar];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/bbq.geojson b/layers/overpass/amenity/sustenance/bbq.geojson
new file mode 100644
index 0000000..5f269d4
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/bbq.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "BBQ",
+    "id": "bbq",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-bbq",
+    "query": "nwr[amenity=bbq];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/biergarten.geojson b/layers/overpass/amenity/sustenance/biergarten.geojson
new file mode 100644
index 0000000..4bdc5a6
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/biergarten.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Biergarten",
+    "id": "biergarten",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-beer",
+    "query": "nwr[amenity=biergarten];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/cafe.geojson b/layers/overpass/amenity/sustenance/cafe.geojson
new file mode 100644
index 0000000..8865ed4
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/cafe.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Cafe",
+    "id": "cafe",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-cafe",
+    "query": "nwr[amenity=cafe];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/drinking_water.geojson b/layers/overpass/amenity/sustenance/drinking_water.geojson
new file mode 100644
index 0000000..b03abdd
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/drinking_water.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Drinking water",
+    "id": "drinking_water",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-drinking-water",
+    "query": "nwr[amenity=drinking_water];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/fast_food.geojson b/layers/overpass/amenity/sustenance/fast_food.geojson
new file mode 100644
index 0000000..c4d05ec
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/fast_food.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Fast food",
+    "id": "fast_food",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-fast-food",
+    "query": "nwr[amenity=fast_food];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/food_court.geojson b/layers/overpass/amenity/sustenance/food_court.geojson
new file mode 100644
index 0000000..82d72be
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/food_court.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Food court",
+    "id": "food_court",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-restaurant",
+    "query": "nwr[amenity=food_court];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/ice_cream.geojson b/layers/overpass/amenity/sustenance/ice_cream.geojson
new file mode 100644
index 0000000..0abd8c2
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/ice_cream.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Ice cream",
+    "id": "ice_cream",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-ice-cream",
+    "query": "nwr[amenity=ice_cream];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/pub.geojson b/layers/overpass/amenity/sustenance/pub.geojson
new file mode 100644
index 0000000..afd338f
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/pub.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Pub",
+    "id": "pub",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-beer",
+    "query": "nwr[amenity=pub];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/sustenance/restaurant.geojson b/layers/overpass/amenity/sustenance/restaurant.geojson
new file mode 100644
index 0000000..b3eb16d
--- /dev/null
+++ b/layers/overpass/amenity/sustenance/restaurant.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Restaurant",
+    "id": "restaurant",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-restaurant",
+    "query": "nwr[amenity=restaurant];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/bicycle_parking.geojson b/layers/overpass/amenity/transportation/bicycle_parking.geojson
new file mode 100644
index 0000000..419a592
--- /dev/null
+++ b/layers/overpass/amenity/transportation/bicycle_parking.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bicycle parking",
+    "id": "bicycle_parking",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-bicycle",
+    "query": "nwr[amenity=bicycle_parking];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/bicycle_rental.geojson b/layers/overpass/amenity/transportation/bicycle_rental.geojson
new file mode 100644
index 0000000..f1f520d
--- /dev/null
+++ b/layers/overpass/amenity/transportation/bicycle_rental.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bicycle rental",
+    "id": "bicycle_rental",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-bicycle_rental",
+    "query": "nwr[amenity=bicycle_rental];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/bicycle_repair_station.geojson b/layers/overpass/amenity/transportation/bicycle_repair_station.geojson
new file mode 100644
index 0000000..7dfdff7
--- /dev/null
+++ b/layers/overpass/amenity/transportation/bicycle_repair_station.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bicycle repair station",
+    "id": "bicycle_repair_station",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-bicycle_repair",
+    "query": "nwr[amenity=bicycle_repair_station];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/boat_rental.geojson b/layers/overpass/amenity/transportation/boat_rental.geojson
new file mode 100644
index 0000000..eddbd68
--- /dev/null
+++ b/layers/overpass/amenity/transportation/boat_rental.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Boat rental",
+    "id": "boat_rental",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-boat_rental",
+    "query": "nwr[amenity=boat_rental];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/boat_sharing.geojson b/layers/overpass/amenity/transportation/boat_sharing.geojson
new file mode 100644
index 0000000..bb90f8c
--- /dev/null
+++ b/layers/overpass/amenity/transportation/boat_sharing.geojson
@@ -0,0 +1,11 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Boat sharing",
+    "id": "boat_sharing",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "query": "nwr[amenity=boat_sharing];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/bus_station.geojson b/layers/overpass/amenity/transportation/bus_station.geojson
new file mode 100644
index 0000000..21dcdfd
--- /dev/null
+++ b/layers/overpass/amenity/transportation/bus_station.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bus station",
+    "id": "bus_station",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-bus",
+    "query": "nwr[amenity=bus_station];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/car_rental.geojson b/layers/overpass/amenity/transportation/car_rental.geojson
new file mode 100644
index 0000000..3128662
--- /dev/null
+++ b/layers/overpass/amenity/transportation/car_rental.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Car rental",
+    "id": "car_rental",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-car-rental",
+    "query": "nwr[amenity=car_rental];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/car_sharing.geojson b/layers/overpass/amenity/transportation/car_sharing.geojson
new file mode 100644
index 0000000..0d58e01
--- /dev/null
+++ b/layers/overpass/amenity/transportation/car_sharing.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Car sharing",
+    "id": "car_sharing",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-sign_and_car",
+    "query": "nwr[amenity=car_sharing];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/car_wash.geojson b/layers/overpass/amenity/transportation/car_wash.geojson
new file mode 100644
index 0000000..a015a5e
--- /dev/null
+++ b/layers/overpass/amenity/transportation/car_wash.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Car wash",
+    "id": "car_wash",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-car_wash",
+    "query": "nwr[amenity=car_wash];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/charging_station.geojson b/layers/overpass/amenity/transportation/charging_station.geojson
new file mode 100644
index 0000000..a952420
--- /dev/null
+++ b/layers/overpass/amenity/transportation/charging_station.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Charging station",
+    "id": "charging_station",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-charging-station",
+    "query": "nwr[amenity=charging_station];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/ferry_terminal.geojson b/layers/overpass/amenity/transportation/ferry_terminal.geojson
new file mode 100644
index 0000000..c5706e6
--- /dev/null
+++ b/layers/overpass/amenity/transportation/ferry_terminal.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Ferry terminal",
+    "id": "ferry_terminal",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-ferry",
+    "query": "nwr[amenity=ferry_terminal];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/fuel.geojson b/layers/overpass/amenity/transportation/fuel.geojson
new file mode 100644
index 0000000..dab85c7
--- /dev/null
+++ b/layers/overpass/amenity/transportation/fuel.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Fuel",
+    "id": "fuel",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-fuel",
+    "query": "nwr[amenity=fuel];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/grit_bin.geojson b/layers/overpass/amenity/transportation/grit_bin.geojson
new file mode 100644
index 0000000..b1ad652
--- /dev/null
+++ b/layers/overpass/amenity/transportation/grit_bin.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Grit bin",
+    "id": "grit_bin",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-box",
+    "query": "nwr[amenity=grit_bin];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/motorcycle_parking.geojson b/layers/overpass/amenity/transportation/motorcycle_parking.geojson
new file mode 100644
index 0000000..12c9a1b
--- /dev/null
+++ b/layers/overpass/amenity/transportation/motorcycle_parking.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Motorcycle parking",
+    "id": "motorcycle_parking",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-motorcycle",
+    "query": "nwr[amenity=motorcycle_parking];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/parking.geojson b/layers/overpass/amenity/transportation/parking.geojson
new file mode 100644
index 0000000..de168ed
--- /dev/null
+++ b/layers/overpass/amenity/transportation/parking.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Parking",
+    "id": "parking",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-car_parked",
+    "query": "nwr[amenity=parking];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/parking_entrance.geojson b/layers/overpass/amenity/transportation/parking_entrance.geojson
new file mode 100644
index 0000000..de218ef
--- /dev/null
+++ b/layers/overpass/amenity/transportation/parking_entrance.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Parking entrance",
+    "id": "parking_entrance",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-entrance-alt1",
+    "query": "nwr[amenity=parking_entrance];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/parking_space.geojson b/layers/overpass/amenity/transportation/parking_space.geojson
new file mode 100644
index 0000000..2ad2f62
--- /dev/null
+++ b/layers/overpass/amenity/transportation/parking_space.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Parking space",
+    "id": "parking_space",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-parking_space",
+    "query": "nwr[amenity=parking_space];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/taxi.geojson b/layers/overpass/amenity/transportation/taxi.geojson
new file mode 100644
index 0000000..f61af9d
--- /dev/null
+++ b/layers/overpass/amenity/transportation/taxi.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Taxi",
+    "id": "taxi",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-taxi",
+    "query": "nwr[amenity=taxi];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/amenity/transportation/vehicle_inspection.geojson b/layers/overpass/amenity/transportation/vehicle_inspection.geojson
new file mode 100644
index 0000000..f34bf52
--- /dev/null
+++ b/layers/overpass/amenity/transportation/vehicle_inspection.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Vehicle inspection",
+    "id": "vehicle_inspection",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-car",
+    "query": "nwr[amenity=vehicle_inspection];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/bakery.geojson b/layers/overpass/shop/food/bakery.geojson
new file mode 100644
index 0000000..a481eef
--- /dev/null
+++ b/layers/overpass/shop/food/bakery.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Bakery",
+    "id": "bakery",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-bakery",
+    "query": "nwr[shop=bakery];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/beverages.geojson b/layers/overpass/shop/food/beverages.geojson
new file mode 100644
index 0000000..2a3a29f
--- /dev/null
+++ b/layers/overpass/shop/food/beverages.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Beverages",
+    "id": "beverages",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-bottles",
+    "query": "nwr[shop=beverages];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/butcher.geojson b/layers/overpass/shop/food/butcher.geojson
new file mode 100644
index 0000000..6297d77
--- /dev/null
+++ b/layers/overpass/shop/food/butcher.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Butcher",
+    "id": "butcher",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-cleaver",
+    "query": "nwr[shop=butcher];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/cheese.geojson b/layers/overpass/shop/food/cheese.geojson
new file mode 100644
index 0000000..97b9493
--- /dev/null
+++ b/layers/overpass/shop/food/cheese.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Cheese",
+    "id": "cheese",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-cheese",
+    "query": "nwr[shop=cheese];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/coffee.geojson b/layers/overpass/shop/food/coffee.geojson
new file mode 100644
index 0000000..348137c
--- /dev/null
+++ b/layers/overpass/shop/food/coffee.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Coffee",
+    "id": "coffee",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-coffee",
+    "query": "nwr[shop=coffee];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/convenience.geojson b/layers/overpass/shop/food/convenience.geojson
new file mode 100644
index 0000000..b59466b
--- /dev/null
+++ b/layers/overpass/shop/food/convenience.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Convenience",
+    "id": "convenience",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-shopping-basket",
+    "query": "nwr[shop=convenience];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/greengrocer.geojson b/layers/overpass/shop/food/greengrocer.geojson
new file mode 100644
index 0000000..0fcd9ae
--- /dev/null
+++ b/layers/overpass/shop/food/greengrocer.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Greengrocer",
+    "id": "greengrocer",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-carrot",
+    "query": "nwr[shop=greengrocer];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/health_food.geojson b/layers/overpass/shop/food/health_food.geojson
new file mode 100644
index 0000000..200324c
--- /dev/null
+++ b/layers/overpass/shop/food/health_food.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Health food",
+    "id": "health_food",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-shop",
+    "query": "nwr[shop=health_food];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/ice_cream_shop.geojson b/layers/overpass/shop/food/ice_cream_shop.geojson
new file mode 100644
index 0000000..47e2462
--- /dev/null
+++ b/layers/overpass/shop/food/ice_cream_shop.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Ice cream",
+    "id": "ice_cream_shop",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-ice-cream",
+    "query": "nwr[shop=ice_cream];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/shop/food/organic.geojson b/layers/overpass/shop/food/organic.geojson
new file mode 100644
index 0000000..e44a1d1
--- /dev/null
+++ b/layers/overpass/shop/food/organic.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Organic",
+    "id": "organic",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-grocery",
+    "query": "nwr[shop~'supermarket|convenience'][organic][organic!=no];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/apartment.geojson b/layers/overpass/tourism/apartment.geojson
new file mode 100644
index 0000000..b329df8
--- /dev/null
+++ b/layers/overpass/tourism/apartment.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Apartment",
+    "id": "apartment",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-lodging",
+    "query": "nwr[tourism=apartment];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/artwork.geojson b/layers/overpass/tourism/artwork.geojson
new file mode 100644
index 0000000..d682aea
--- /dev/null
+++ b/layers/overpass/tourism/artwork.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Artwork",
+    "id": "artwork",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-art-gallery",
+    "query": "nwr[tourism=artwork];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/attraction.geojson b/layers/overpass/tourism/attraction.geojson
new file mode 100644
index 0000000..59ed825
--- /dev/null
+++ b/layers/overpass/tourism/attraction.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Attraction",
+    "id": "attraction",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-star",
+    "query": "nwr[tourism=attraction];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/camp_site.geojson b/layers/overpass/tourism/camp_site.geojson
new file mode 100644
index 0000000..ee57a5c
--- /dev/null
+++ b/layers/overpass/tourism/camp_site.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Camp site",
+    "id": "camp_site",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-campsite",
+    "query": "nwr[tourism=camp_site];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/caravan_site.geojson b/layers/overpass/tourism/caravan_site.geojson
new file mode 100644
index 0000000..fe8b593
--- /dev/null
+++ b/layers/overpass/tourism/caravan_site.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Caravan site",
+    "id": "caravan_site",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-camper_trailer",
+    "query": "nwr[tourism=caravan_site];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/chalet.geojson b/layers/overpass/tourism/chalet.geojson
new file mode 100644
index 0000000..17ef08a
--- /dev/null
+++ b/layers/overpass/tourism/chalet.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Chalet",
+    "id": "chalet",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-cabin",
+    "query": "nwr[tourism=chalet];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/gallery.geojson b/layers/overpass/tourism/gallery.geojson
new file mode 100644
index 0000000..74757a7
--- /dev/null
+++ b/layers/overpass/tourism/gallery.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Gallery",
+    "id": "gallery",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-art-gallery",
+    "query": "nwr[tourism=gallery];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/guest_house.geojson b/layers/overpass/tourism/guest_house.geojson
new file mode 100644
index 0000000..2a9b868
--- /dev/null
+++ b/layers/overpass/tourism/guest_house.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Guest house",
+    "id": "guest_house",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-lodging",
+    "query": "nwr[tourism=guest_house];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/hostel.geojson b/layers/overpass/tourism/hostel.geojson
new file mode 100644
index 0000000..ef7d74e
--- /dev/null
+++ b/layers/overpass/tourism/hostel.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Hostel",
+    "id": "hostel",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-bunk_beds",
+    "query": "nwr[tourism=hostel];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/hotel.geojson b/layers/overpass/tourism/hotel.geojson
new file mode 100644
index 0000000..74b59ef
--- /dev/null
+++ b/layers/overpass/tourism/hotel.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Hotel",
+    "id": "hotel",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "fas-concierge-bell",
+    "query": "nwr[tourism=hotel];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/information.geojson b/layers/overpass/tourism/information.geojson
new file mode 100644
index 0000000..41f6c82
--- /dev/null
+++ b/layers/overpass/tourism/information.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Information",
+    "id": "information",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-information",
+    "query": "nwr[tourism=information];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/motel.geojson b/layers/overpass/tourism/motel.geojson
new file mode 100644
index 0000000..bddd0c4
--- /dev/null
+++ b/layers/overpass/tourism/motel.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Motel",
+    "id": "motel",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-lodging",
+    "query": "nwr[tourism=motel];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/museum.geojson b/layers/overpass/tourism/museum.geojson
new file mode 100644
index 0000000..1b9f994
--- /dev/null
+++ b/layers/overpass/tourism/museum.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Museum",
+    "id": "museum",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-museum",
+    "query": "nwr[tourism=museum];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/picnic_site.geojson b/layers/overpass/tourism/picnic_site.geojson
new file mode 100644
index 0000000..fa86bb9
--- /dev/null
+++ b/layers/overpass/tourism/picnic_site.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Picnic site",
+    "id": "picnic_site",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "maki-picnic-site",
+    "query": "nwr[tourism=picnic_site];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/viewpoint.geojson b/layers/overpass/tourism/viewpoint.geojson
new file mode 100644
index 0000000..f6af98e
--- /dev/null
+++ b/layers/overpass/tourism/viewpoint.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Viewpoint",
+    "id": "viewpoint",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-spotting_scope",
+    "query": "nwr[tourism=viewpoint];"
+  },
+  "type": "Feature"
+}
diff --git a/layers/overpass/tourism/wilderness_hut.geojson b/layers/overpass/tourism/wilderness_hut.geojson
new file mode 100644
index 0000000..3f25909
--- /dev/null
+++ b/layers/overpass/tourism/wilderness_hut.geojson
@@ -0,0 +1,12 @@
+{
+  "geometry": null,
+  "properties": {
+    "name": "Wilderness hut",
+    "id": "wilderness_hut",
+    "overlay": true,
+    "dataSource": "OverpassAPI",
+    "icon": "temaki-cabin",
+    "query": "nwr[tourism=wilderness_hut];"
+  },
+  "type": "Feature"
+}
diff --git a/locales/ca.json b/locales/ca.json
index bad07a8..62c80b1 100644
--- a/locales/ca.json
+++ b/locales/ca.json
@@ -15,7 +15,7 @@
     "tooltip": "Mostra més informació sobre BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Fronteres administratives: <a href=\"https://osm-boundaries.com\" target=\"_blank\">Fronteres-OSM</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">API d'Overpass</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Dades d'elevació",
@@ -25,7 +25,8 @@
     "map-tiles": "Tessel·les del mapa",
     "nominatim": "Cerca per <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >contribuïdors d'OpenStreetMap</a> sota <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
-    "title": "Credits"
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
+    "title": "Crèdits"
   },
   "export": {
     "format": "Format",
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Factor de cost mitjà",
     "meter": "metres",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Desnivell final",
     "stats-info": "Comenceu a dibuixar una ruta per obtenir les estadístiques",
     "total-energy": "Energia total",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Afegeix una capa base",
     "add-overlay": "Afegeix superposició",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Personalitza les capes",
     "opacity-slider": "Control lliscant de l'opacitat",
-    "placeholder-layer-name": "Nom de la capa personalitzada. (eg: OpenStreetMap)",
-    "placeholder-layer-url": "URL de la capa personalitzada. (eg: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Elimina la selecció"
   },
   "loadNogos": {
     "defaultProperties": "Propietats per defecte",
-    "file": "Fitxer (.geojson):",
+    "file": "File (.geojson)",
     "load": "Carrega",
-    "nogoBuffer": "Zona d'influència de les àrees omeses (en metres):",
-    "nogoRadius": "Radi de les àrees omeses per punts (en metres)",
-    "nogoWeight": "Pes de les àrees omeses (-1 vol dir inaccessible)",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Font",
     "title": "Carrega les àrees omeses",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "Contribuidors de l'OpenStreetMap",
@@ -96,8 +103,8 @@
     "delete-nogo-areas": "Esborra totes les àrees omeses",
     "delete-pois": "Esborra tots els punts d'interès",
     "delete-route": "Esborra la ruta",
-    "draw-circlego-start": "Draw limited go-to zone",
-    "draw-circlego-stop": "Stop drawing limited go-to zone",
+    "draw-circlego-start": "Dibuixa una zona de pas limitada",
+    "draw-circlego-stop": "Para de dibuixar una zona de pas limitada",
     "draw-poi-start": "Dibuixa punts d'interès",
     "draw-poi-stop": "Para de dibuixar punts d'interès",
     "draw-route-start": "Dibuixa una ruta",
@@ -132,7 +139,7 @@
       "edit": "Cliqueu per editar",
       "help": "&square; = mou / redimensiona, <span class=\"fa fa-trash-o\"></span> = esborra,<br>clique al cercle per deixar d'editar"
     },
-    "not-applicable-here": "not applicable here",
+    "not-applicable-here": "no aplicable aquí",
     "opacity-slider": "Especifica la transparència de la ruta i els marcadors",
     "opacity-slider-shortcut": "{{action}}\n(Mantén premuda la tecla {{key}} per silenciar temporalment)",
     "preview": "Previsualitza",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Codificació del cost",
     "route-quality-incline": "Codificació de la inclinació",
     "route-quality-shortcut": "{{action}} (tecla {{key}} per commutar)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Mostra els segments de bici de Strava",
     "strava-running": "Mostra els segments de córrer de Strava",
     "strava-shortcut": "{{action}}\n(tecla {{key}} per commutar les capes, cliqueu per recarregar l'àrea actual)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Allunya"
   },
   "modal": {
-    "close": "Tanca"
-  },
+    "close": "Tanca"},
   "navbar": {
     "about": "Quant a",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Carrega les àrees omeses",
       "title": "Carrega",
-      "tooltip": "{{tracksAction}} (tecla {{tracksKey}})\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} (tecla {{tracksKey}})\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Carrega traces"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europa",
         "europe-monolingual": "Europa monolingüe",
         "overlays": "Superposicions",
+        "overpass": "Locations (POIs)",
         "worldwide": "Arreu del món",
         "worldwide-international": "Arreu del món internacional",
         "worldwide-monolingual": "Arreu del món monolígüe"
@@ -238,11 +247,15 @@
       "optional": "Afegeix o elimina capes opcionals",
       "optional-layers": "Més",
       "overlay-opacity": "Transparència de la superposició",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "Encara no hi ha cap capa personalitzada configurada.",
         "name": "Nom",
-        "type": "Tipus"
+        "type": "Tipus",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Capes",
       "tooltip": "Seleccioneu capes"
@@ -260,10 +273,11 @@
   },
   "title": "Client web de BRouter",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(mostra les fites com a PDI)",
     "explaintracklayer": "(mostra traces com a capa separada)",
     "file": "Fitxer de traça",
-    "fuzziness": "grau d'aproximació",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Espereu si us plau.",
     "showpois": "PDI",
     "title": "Carrega una traça com a ruta",
@@ -283,7 +297,7 @@
     "upload-error": "Error de càrrega: {{error}}"
   },
   "whatsnew": {
-    "new-version": "A new version was released since your last visit. Click <a href='.' data-toggle='modal' data-target='#whatsnew'>here</a> to see what's new!",
-    "title": "What's new?"
+    "new-version": "S'ha alliberat una versió nova des de l'última visita. Cliqueu <a href='.' data-toggle='modal' data-target='#whatsnew'>aquí</a> per veure les novetats!",
+    "title": "Què hi ha de nou?"
   }
 }
diff --git a/locales/de.json b/locales/de.json
index 39bbf6d..fa1bd37 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -15,7 +15,7 @@
     "tooltip": "Mehr Informationen über BRouter-Web anzeigen"
   },
   "credits": {
-    "boundaries": "Verwaltungsgrenzen: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Verwaltungsgrenzen: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Höhendaten",
@@ -25,6 +25,7 @@
     "map-tiles": "Kartendarstellung",
     "nominatim": "Suchen mit <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> unter <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Orte (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "durchschnittlicher Kostenfaktor",
     "meter": "Meter",
     "meter-abbrev": "m",
+    "no-elevation-data": "Keine Höhendaten für diese Route verfügbar",
     "plain-ascend": "einfach aufsteigend",
     "stats-info": "Route zeichnen, um Statistiken zu sehen.",
     "total-energy": "Gesamtenergie",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Basisebene hinzufügen",
     "add-overlay": "Overlay hinzufügen",
+    "add-overpass": "Overpass Abfrage hinzufügen",
+    "custom-layer-name-helptext": "Bsp: OpenStreetMap",
+    "custom-layer-name-label": "Name der benutzerdefinierten Ebene",
+    "custom-layer-url-helptext-normal": "URL für normale Ebenen, z.B.: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Abfrage, z.B.: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "URL/Abfrage der benutzerdefinierten Ebene",
     "customize": "Ebenen anpassen",
     "opacity-slider": "Regler für Deckkraft",
-    "placeholder-layer-name": "angepasster Ebenenname (Bsp: OpenStreetMap)",
-    "placeholder-layer-url": "angepasste Ebenen-URL (Bsp: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Overpass API Abfrage läuft ...",
     "remove-selection": "Auswahl entfernen"
   },
   "loadNogos": {
     "defaultProperties": "Standardeigenschaften",
-    "file": "Datei (.geojson):",
+    "file": "Datei (.geojson)",
     "load": "Laden",
-    "nogoBuffer": "Puffer um No-go-Areas (in Metern):",
-    "nogoRadius": "No-go Radius für Punkte (in Meter):",
-    "nogoWeight": "No-go Gewichtung (-1 bedeutet unpassierbar):",
+    "nogoBuffer": "Puffer um No-go-Areas (in Metern)",
+    "nogoRadius": "No-go Radius für Punkte (in Meter)",
+    "nogoWeight": "No-go Gewichtung (-1 bedeutet unpassierbar)",
     "source": "Quelle",
     "title": "No-go-Areas laden",
-    "url": "URL:"
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap-Mitwirkende",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Kostencodierung",
     "route-quality-incline": "Steigungscodierung",
     "route-quality-shortcut": "{{action}} ({{key}} Taste zum Ein-/Ausschalten)",
+    "route-tooltip-segment": "Ziehen, um einen neuen Wegpunkt anzulegen",
+    "route-tooltip-waypoint": "Wegpunkt. Zum Verschieben ziehen; zum Löschen klicken",
     "strava-biking": "Zeige Strava Radfahrsegmente",
     "strava-running": "Zeige Strava Läufersegmente",
     "strava-shortcut": "{{action}}\n({{key}} Taste um Ebene ein-/auszublenden, Klicken um aktuellen Ausschnitt neu zu laden)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Herauszoomen"
   },
   "modal": {
-    "close": "Schließen"
-  },
+    "close": "Schließen"},
   "navbar": {
     "about": "Über",
     "alternative": {
@@ -164,8 +172,8 @@
     "load": {
       "nogos": "No-go-Areas laden",
       "title": "Laden",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} Taste)\n{{nogosAction}} ({{nogosKey}})",
-      "tracks": "Touren laden"
+      "tooltip": "{{tracksAction}} ({{tracksKey}} Taste)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
+      "tracks": "Track laden"
     },
     "profile": {
       "car-eco": "Auto (effizient)",
@@ -227,6 +235,7 @@
         "europe": "Europa",
         "europe-monolingual": "Europa einsprachig",
         "overlays": "Überlagerungen",
+        "overpass": "Orte (POIs)",
         "worldwide": "Weltweit",
         "worldwide-international": "Weltweit international",
         "worldwide-monolingual": "Weltweit einsprachig"
@@ -238,11 +247,15 @@
       "optional": "Optionale Ebenen hinzufügen oder entfernen",
       "optional-layers": "Mehr",
       "overlay-opacity": "Transparenz der Überlagerung",
+      "overlay-opacity_plural": "Transparenz der Überlagerung",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Abfrage",
         "empty": "Noch keine benutzerdefinierte Ebene definiert.",
         "name": "Name",
-        "type": "Typ"
+        "type": "Typ",
+        "type_layer": "Ebene",
+        "type_overlay": "Überlagerung",
+        "type_overpass_query": "Overpass Abfrage"
       },
       "title": "Ebenen",
       "tooltip": "Ebenen auswählen"
@@ -260,13 +273,14 @@
   },
   "title": "BRouter Web Client",
   "trackasroute": {
+    "browse": "Durchsuchen",
     "explainpoi": "(Wegpunkte als POIs anzeigen)",
     "explaintracklayer": "(Tour als separate Ebene anzeigen)",
-    "file": "Tourdatei",
+    "file": "Track-Datei",
     "fuzziness": "Unschärfe",
     "pleasewait": "Bitte warten!",
     "showpois": "POIs",
-    "title": "Tour als Route laden",
+    "title": "Track als Route laden",
     "tracklayer": "Tour-Ebene",
     "tuning": "Justierung"
   },
@@ -279,11 +293,11 @@
     "profile-error": "Profil-Fehler: keine oder leere Antwort vom Server",
     "strava-error": "Fehler beim Laden der Strava Segmente: {{error}}",
     "temporary-profile": "<strong>Note:</strong> Hochgeladene benutzerdefinierte Profile nur verübergehend auf dem Server zwischengespeichert. <br/>Bitte Bearbeitungen auf dem lokalen PC speichern.",
-    "tracks-load-error": "Fehler beim Laden der Touren: {{error}}",
+    "tracks-load-error": "Fehler beim Laden von tracks: {{error}}",
     "upload-error": "Fehler beim Hochladen: {{error}}"
   },
   "whatsnew": {
-    "new-version": "A new version was released since your last visit. Click <a href='.' data-toggle='modal' data-target='#whatsnew'>here</a> to see what's new!",
-    "title": "What's new?"
+    "new-version": "Seit dem letzten Besuch wurde eine neue Version veröffentlicht. <a href='.' data-toggle='modal' data-target='#whatsnew'>Hier</a> klicken, um zu sehen, was neu ist!",
+    "title": "Was ist neu?"
   }
 }
diff --git a/locales/en.json b/locales/en.json
index 88ff997..cecdb83 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Elevation data",
@@ -25,6 +25,7 @@
     "map-tiles": "Map tiles",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -70,22 +71,27 @@
   "layers": {
     "add-base": "Add base layer",
     "add-overlay": "Add overlay",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Customize layers",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Remove selection"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Load",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Source",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap contributors",
@@ -152,7 +158,8 @@
     "zoomOutTitle": "Zoom out"
   },
   "modal": {
-    "close": "Close"
+    "close": "Close",
+    "or": ""
   },
   "navbar": {
     "about": "About",
@@ -167,7 +174,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -230,6 +237,7 @@
         "europe": "Europe",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -243,12 +251,13 @@
       "overlay-opacity": "Overlay transparency",
       "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No custom layer configured yet.",
         "name": "Name",
         "type": "Type",
         "type_layer": "Layer",
-        "type_overlay": "Overlay"
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Layers",
       "tooltip": "Select layers"
@@ -266,10 +275,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/eo.json b/locales/eo.json
index a67f09e..4c76fdc 100644
--- a/locales/eo.json
+++ b/locales/eo.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Elevation data",
@@ -25,6 +25,7 @@
     "map-tiles": "Map tiles",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Mean cost factor",
     "meter": "metroj",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total Energy",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Add base layer",
     "add-overlay": "Add overlay",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Customize layers",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Remove selection"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Load",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Fonto",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap contributors",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Cost coding",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Show Strava biking segments",
     "strava-running": "Show Strava running segments",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Malgrandigi"
   },
   "modal": {
-    "close": "Fermi"
-  },
+    "close": "Fermi"},
   "navbar": {
     "about": "Pri",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Eŭropo",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Tegiloj",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "Pli",
       "overlay-opacity": "Overlay transparency",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No custom layer configured yet.",
         "name": "Nomo",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Layers",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/es.json b/locales/es.json
new file mode 100644
index 0000000..bda55b0
--- /dev/null
+++ b/locales/es.json
@@ -0,0 +1,303 @@
+{
+  "about": {
+    "bug-reports": "Informes de errores y solicitudes de funciones:",
+    "bug-reports-back": "servidor / backend, motor de enrutamiento, aplicación de Android, perfiles, sitio brouter.de",
+    "bug-reports-front": "cliente web / frontend.",
+    "chat": "Chatea con usuarios y desarrolladores",
+    "contact": "Contacto:",
+    "contact-language": "El idioma preferido es el inglés, ya que contamos con colaboradores y usuarios internacionales.",
+    "data": "Datos:",
+    "data-description": "Esta basado en <a href=\"https://www.openstreetmap.org\" target=\"_blank\">OpenStreetMap</a>. Por lo general se actualiza a diario, consulte las fechas <a href=\"https://brouter.de/brouter/segments4/\" target=\"_blank\">de los archivos</a>.",
+    "description": "Servicio en línea del motor de enrutamiento BRouter. Para la aplicación de Android sin conexión y más información, consulte  <a href=\"https://brouter.de/\" target=\"_blank\">brouter.de</a>",
+    "details": "<i><a href=\"{{privacyPolicyUrl}}\" target=\"_blank\">Política de privacidad</a></i>, \n<i><a href=\"https://github.com/nrenner/brouter-web#credits-and-licenses\" target=\"_blank\">Creditos</a></i>,\n<i><a href=\"https://github.com/nrenner/brouter-web/blob/master/CHANGELOG.md\" target=\"_blank\">Registro de cambios</a></i> y\n<i><a href=\"https://github.com/nrenner/brouter-web#readme\" target=\"_blank\">más información</a></i> sobre el cliente.",
+    "support": "Discusiones / preguntas generales, soporte",
+    "title": "Acerca de",
+    "tooltip": "Mostrar más información sobre BRouter-Web"
+  },
+  "credits": {
+    "boundaries": "Límites administrativos: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
+    "brouter": "BRouter",
+    "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
+    "elevation-data": "Datos de elevación",
+    "esri-license": "<a target=\"_blank\" href=\"http://goto.arcgisonline.com/maps/World_Imagery\">Imágenes del mundo</a> &copy; <a target=\"_blank\" href=\"https://www.esri.com/\">Esri</a>, fuentes: Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, and the GIS User Community",
+    "esri-tiles": "Imágenes Esri World",
+    "map-data": "Datos del mapa",
+    "map-tiles": "Teselas del mapa",
+    "nominatim": "Búsqueda por <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
+    "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >Colaboradores de OpenStreetMap</a> bajo <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Ubicaciones (PDI): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
+    "title": "Créditos"
+  },
+  "export": {
+    "format": "Formato",
+    "format_csv": "CSV",
+    "format_geojson": "GeoJSON",
+    "format_gpx": "GPX",
+    "format_kml": "KML",
+    "include": "Incluir",
+    "include_waypoints": "Waypoints",
+    "route-from-to": "{{from}} -> {{to}} ({{distance}}km)",
+    "route-loop": "{{from}} ({{distance}}km)",
+    "title": "Exportar ruta",
+    "trackname": "Nombre"
+  },
+  "footer": {
+    "ascend": "Ascensión",
+    "cost": "Costo",
+    "distance": "Distancia",
+    "elevation-chart": "Alternar gráfico de elevación",
+    "energy-per-100km": "Energía por 100 km",
+    "hours": "horas",
+    "hours-abbrev": "h",
+    "kilometer": "kilómetros",
+    "kilometer-abbrev": "km",
+    "kilowatthour": "kilovatios hora",
+    "kilowatthour-abbrev": "kWh",
+    "mean-cost-factor": "Factor de costo medio",
+    "meter": "metros",
+    "meter-abbrev": "m",
+    "no-elevation-data": "No hay datos de elevación disponibles para esta ruta.",
+    "plain-ascend": "Ascenso llano",
+    "stats-info": "Empiece a trazar una ruta para obtener estadísticas.",
+    "total-energy": "Energia total",
+    "travel-time": "Tiempo de viaje"
+  },
+  "keyboard": {
+    "backspace": "Retroceso",
+    "escape": "Escape",
+    "generic-shortcut": "{{action}} (tecla {{key}})",
+    "shift": "Mayús"
+  },
+  "layers": {
+    "add-base": "Añadir capa base",
+    "add-overlay": "Añadir superposición",
+    "add-overpass": "Agregar consulta de overpass",
+    "custom-layer-name-helptext": "por ejemplo: OpenStreetMap",
+    "custom-layer-name-label": "Nombre de la capa personalizada",
+    "custom-layer-url-helptext-normal": "URL para capas normales, por ejemplo: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Consulta de Overpass, por ejemplo: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "URL / consulta de capa personalizada",
+    "customize": "Personalizar capas",
+    "opacity-slider": "Control deslizante de opacidad",
+    "overpass-loading-indicator": "Ejecutando la consulta de la API de Overpass ...",
+    "remove-selection": "Eliminar selección"
+  },
+  "loadNogos": {
+    "defaultProperties": "Propiedades por defecto",
+    "file": "Archivo (.geojson)",
+    "load": "Cargar",
+    "nogoBuffer": "Buffer de áreas prohibidas (en metros)",
+    "nogoRadius": "Radio de prohibición de puntos (en metros)",
+    "nogoWeight": "Peso de prohibición (-1 significa intransitable)",
+    "source": "Fuente",
+    "title": "Cargar áreas prohibidas",
+    "url": "URL"
+  },
+  "map": {
+    "attribution-osm-long": "Colaboradores de OpenStreetMap",
+    "attribution-osm-short": "OpenStreetMap",
+    "clear-route": "Borrar datos de ruta",
+    "copyright": "Copyright",
+    "cycling": "Ciclismo",
+    "delete-last-point": "Eliminar último punto",
+    "delete-nogo-areas": "Eliminar todas las áreas prohibidas",
+    "delete-pois": "Eliminar todos los puntos de interés",
+    "delete-route": "Eliminar ruta",
+    "draw-circlego-start": "Dibujar zona prohibida",
+    "draw-circlego-stop": "Dejar de dibujar una zona prohibida",
+    "draw-poi-start": "Dibujar puntos de interés",
+    "draw-poi-stop": "Deja de dibujar puntos de interés",
+    "draw-route-start": "Dibujar ruta",
+    "draw-route-stop": "Dejar de dibujar la ruta",
+    "enter-poi-name": "Ingrese el nombre del punto de interés",
+    "geocoder": "Buscar",
+    "geocoder-placeholder": "Buscar...",
+    "hikebike-hillshading": "Sombreado",
+    "hiking": "Senderismo",
+    "layer": {
+      "bing": "Bing Aerial",
+      "cycle": "OpenCycleMap (Thunderf.)",
+      "cycling": "Ciclismo (senderos marcados)",
+      "digitalglobe": "Imágenes recientes de DigitalGlobe",
+      "esri": "Imágenes de Esri World",
+      "hikebike-hillshading": "Sombreado de colinas (mapa de senderismo y bicicleta)",
+      "hiking": "Senderismo (senderos marcados)",
+      "osm": "OpenStreetMap",
+      "osmde": "OpenStreetMap.de",
+      "outdoors": "Al aire libre (Thunderforest)",
+      "route-quality": "Codificación de calidad de ruta",
+      "stamen-terrain": "Terreno (Stamen)",
+      "strava-segments": "Segmentos de Strava",
+      "topo": "OpenTopoMap"
+    },
+    "loading": "Cargando...",
+    "locate-me": "Muéstrame dónde estoy",
+    "nogo": {
+      "cancel": "Cancelar el dibujo del área prohibida",
+      "click-drag": "Haga clic y arrastre para dibujar un círculo.",
+      "draw": "Dibujar un área circular prohibida",
+      "edit": "Click para editar",
+      "help": "&square; = mover / cambiar el tamaño, <span class=\"fa fa-trash-o\"></span>= eliminar, <br> haga clic en el círculo para salir de la edición"
+    },
+    "not-applicable-here": "no aplicable aquí",
+    "opacity-slider": "Establecer la transparencia del seguimiento de la ruta y los marcadores",
+    "opacity-slider-shortcut": "{{action}}\n(Mantenga presionada la tecla {{key}} para silenciar temporalmente)",
+    "preview": "Previsualizar",
+    "privacy": "Privacidad",
+    "reverse-route": "Ruta inversa",
+    "route-quality-altitude": "Codificación de altitud",
+    "route-quality-cost": "Codificación de costos",
+    "route-quality-incline": "Codificación de inclinación",
+    "route-quality-shortcut": "{{action}} (tecla {{key}} para alternar)",
+    "route-tooltip-segment": "Arrastre para crear un nuevo waypoint",
+    "route-tooltip-waypoint": "Waypoint. Arrastre para mover; Haga clic para eliminar.",
+    "strava-biking": "Mostrar segmentos de ciclismo de Strava",
+    "strava-running": "Mostrar segmentos de carrera de Strava",
+    "strava-shortcut": "{{action}}\n(tecla {{key}} para alternar la capa, haga clic para volver a cargar el área actual)",
+    "zoomInTitle": "Acercarse",
+    "zoomOutTitle": "Alejarse"
+  },
+  "modal": {
+    "close": "Cerrar"},
+  "navbar": {
+    "about": "Acerca de",
+    "alternative": {
+      "first": "1ª Alternativa",
+      "original": "Original",
+      "second": "2ª Alternativa",
+      "third": "3ª Alternativa"
+    },
+    "export": "Exportar",
+    "export-tooltip": "Exportar ruta",
+    "load": {
+      "nogos": "Cargar áreas prohibidas",
+      "title": "Cargar",
+      "tooltip": "{{tracksAction}} (tecla {{tracksKey}})\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
+      "tracks": "Cargar pistas"
+    },
+    "profile": {
+      "car-eco": "Automóvil (económico)",
+      "car-fast": "Automóvil (rápido)",
+      "car-test": "Automóvil (test)",
+      "custom": "Personalizado",
+      "fastbike": "Fastbike",
+      "fastbike-asia-pacific": "Fastbike (Asia Pacífico)",
+      "fastbike-lowtraffic": "Fastbike (poco tráfico)",
+      "hiking-beta": "Senderismo (beta)",
+      "moped": "Ciclomotor",
+      "rail": "Ferrocarril",
+      "river": "Fluvial",
+      "safety": "Segura",
+      "shortest": "Más corta",
+      "trekking": "Bicicleta de trekking",
+      "trekking-ignore-cr": "Bicicleta de trekking (ignorar rutas en bicicleta)",
+      "trekking-noferries": "Bicicleta de trekking (sin ferries)",
+      "trekking-nosteps": "Bicicleta de trekking (sin escalones)",
+      "trekking-steep": "Bicicleta de trekking (empinada)",
+      "vm-forum-liegerad-schnell": "Bicicleta reclinada (rápida)",
+      "vm-forum-velomobil-schnell": "Velomobile (rápido)"
+    },
+    "profile-tooltip": "\n(tecla {{key}} para cambiar)"
+  },
+  "sidebar": {
+    "analysis": {
+      "header": {
+        "highway": "Carretera",
+        "smoothness": "Suavidad",
+        "surface": "Superficie"
+      },
+      "table": {
+        "category": "Categoría",
+        "length": "Longitud",
+        "total_known": "Total conocido:",
+        "unknown": "Desconocido"
+      },
+      "title": "Análisis",
+      "tooltip": "Analizar ruta"
+    },
+    "customize-profile": {
+      "title": "Personalizar perfil",
+      "tooltip": "Personalizar perfil"
+    },
+    "data": {
+      "sync-map": "Sincronizar mapa",
+      "title": "Datos",
+      "tooltip": "Mostrar tabla de datos de ruta detallada"
+    },
+    "itinerary": {
+      "title": "Itinerario",
+      "tooltip": "Mostrar itinerario"
+    },
+    "layers": {
+      "category": {
+        "base-layers": "Capas base",
+        "country": "País",
+        "europe": "Europa",
+        "europe-monolingual": "Monolingüe Europa",
+        "overlays": "Superposiciones",
+        "overpass": "Ubicaciones (PDI)",
+        "worldwide": "Mundial",
+        "worldwide-international": "Internacional mundial",
+        "worldwide-monolingual": "Monolingüe mundial"
+      },
+      "collapse": "Desplegar todo",
+      "custom-layers": "Capas personalizadas",
+      "customize": "Añadir o eliminar capas personalizadas",
+      "expand": "Expandir todo",
+      "optional": "Añadir o eliminar capas opcionales",
+      "optional-layers": "Más",
+      "overlay-opacity": "Transparencia de superposición",
+      "overlay-opacity_plural": "Transparencia de superposiciones",
+      "table": {
+        "URL": "URL/Consulta",
+        "empty": "No hay una capa personalizada configurada todavía.",
+        "name": "Nombre",
+        "type": "Tipo",
+        "type_layer": "Capa",
+        "type_overlay": "Superposición",
+        "type_overpass_query": "Consulta de Overpass"
+      },
+      "title": "Capas",
+      "tooltip": "Seleccionar capas"
+    },
+    "profile": {
+      "apply": "Aplicar",
+      "clear": "Limpiar",
+      "help": "Ayuda",
+      "no_easy_configuration_warning": "No hay una configuración fácil disponible para este perfil.",
+      "options": "Opciones",
+      "placeholder": "Escriba su perfil personalizado aquí.",
+      "profile": "Perfil"
+    },
+    "tab-tooltip": "{{action}}\n(tecla {{toggleKey}} para alternar, {{switchKey}} para cambiar a la siguiente pestaña)"
+  },
+  "title": "Cliente web de BRoute",
+  "trackasroute": {
+    "browse": "Navegar",
+    "explainpoi": "(mostrar waypoints como PDI)",
+    "explaintracklayer": "(mostrar la pista como una capa separada)",
+    "file": "Trackfile",
+    "fuzziness": "Borrosidad",
+    "pleasewait": "Espere",
+    "showpois": "PDI",
+    "title": "Cargar pista como ruta",
+    "tracklayer": "Capa de pista",
+    "tuning": "Afinación"
+  },
+  "warning": {
+    "cannot-get-route": "Error al obtener la URL de ruta",
+    "invalid-route-from": "El marcador de inicio está demasiado lejos de una ruta.",
+    "invalid-route-to": "El marcador de destino está demasiado lejos de una ruta.",
+    "no-response": "sin respuesta del servidor",
+    "no-route-found": "Error: no se puede encontrar una ruta para los puntos dados. ¿Quizás intentando acercarlos a las carreteras?",
+    "profile-error": "Error de perfil: sin respuesta del servidor",
+    "strava-error": "Error al obtener segmentos de Strava: {{error}}",
+    "temporary-profile": "<strong>Nota:</strong> Los perfiles personalizados cargados solo se almacenan en caché temporalmente en el servidor.<br/> Guarde sus ediciones en su PC local.",
+    "tracks-load-error": "Error al cargar pistas: {{error}}",
+    "upload-error": "Error de carga: {{error}}"
+  },
+  "whatsnew": {
+    "new-version": "Se lanzó una nueva versión desde su última visita. Haga clic <a href='.' data-toggle='modal' data-target='#whatsnew'>aquí</a> para ver las novedades.",
+    "title": "Novedades"
+  }
+}
diff --git a/locales/es_ES.json b/locales/es_ES.json
index f101d1f..60b2bc4 100644
--- a/locales/es_ES.json
+++ b/locales/es_ES.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Datos de elevación",
@@ -25,6 +25,7 @@
     "map-tiles": "Tiles del mapa",
     "nominatim": "Búsqueda por <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >Colaboradores de OpenStreetMap</a> bajo <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Factor de costo medio",
     "meter": "metros",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Ascenso llano",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Energia total",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Añadir capa base",
     "add-overlay": "Añadir superposición",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Personalizar capas",
     "opacity-slider": "Control deslizante de opacidad",
-    "placeholder-layer-name": "Nombre de capa personalizada. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "URL de capa personalizada. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Eliminar selección"
   },
   "loadNogos": {
     "defaultProperties": "Propiedades por defecto",
-    "file": "Archivo (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Cargar",
-    "nogoBuffer": "Buffer de zonas prohibidas (en metros):",
-    "nogoRadius": "Radio prohibido para puntos (en metros):",
-    "nogoWeight": "Peso prohibido (-1 significa intransitable):",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Fuente",
     "title": "Cargar áreas prohibidas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "Colaboradores de OpenStreetMap",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Codificación de costos",
     "route-quality-incline": "Codificación de inclinación",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Mostrar segmentos de ciclismo de Strava",
     "strava-running": "Mostrar segmentos de carrera de Strava",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Alejarse"
   },
   "modal": {
-    "close": "Cerrar"
-  },
+    "close": "Cerrar"},
   "navbar": {
     "about": "Acerca de",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Cargar",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europa",
         "europe-monolingual": "Monolingüe Europa",
         "overlays": "Superposiciones",
+        "overpass": "Locations (POIs)",
         "worldwide": "Mundial",
         "worldwide-international": "Internacional mundial",
         "worldwide-monolingual": "Monolingüe mundial"
@@ -238,11 +247,15 @@
       "optional": "Añadir o eliminar capas opcionales",
       "optional-layers": "Más",
       "overlay-opacity": "Transparencia de superposición",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No hay una capa personalizada configurada todavía.",
         "name": "Nombre",
-        "type": "Tipo"
+        "type": "Tipo",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Capas",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRoute web cliente",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/fa.json b/locales/fa.json
index 8519200..92b018d 100644
--- a/locales/fa.json
+++ b/locales/fa.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Elevation data",
@@ -25,6 +25,7 @@
     "map-tiles": "Map tiles",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Mean cost factor",
     "meter": "meters",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total Energy",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Add base layer",
     "add-overlay": "Add overlay",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Customize layers",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Remove selection"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Load",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Source",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap contributors",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Cost coding",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Show Strava biking segments",
     "strava-running": "Show Strava running segments",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Zoom out"
   },
   "modal": {
-    "close": "Close"
-  },
+    "close": "Close"},
   "navbar": {
     "about": "About",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europe",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "More",
       "overlay-opacity": "Overlay transparency",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No custom layer configured yet.",
         "name": "Name",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Layers",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/fr.json b/locales/fr.json
index 37a47a6..301eb26 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -15,7 +15,7 @@
     "tooltip": "Afficher plus d'informations à propos de BRouter-Web"
   },
   "credits": {
-    "boundaries": "limites administratives: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "limites administratives: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Données d'élévation",
@@ -25,6 +25,7 @@
     "map-tiles": "Tuiles de carte",
     "nominatim": "Recherche par <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >contributeurs OpenStreetMap</a> sous <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Lieux (PIs) : <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">API Overpass</a>",
     "title": "Crédits"
   },
   "export": {
@@ -55,8 +56,9 @@
     "mean-cost-factor": "Facteur coût moyen",
     "meter": "mètres",
     "meter-abbrev": "m",
+    "no-elevation-data": "Aucune donnée d'élévation pour ce parcours.",
     "plain-ascend": "faux plat",
-    "stats-info": "Commencer un itinéraire pour voir ses stats.",
+    "stats-info": "Tracer un itinéraire pour voir ses stats.",
     "total-energy": "Énergie totale",
     "travel-time": "Temps de trajet"
   },
@@ -68,23 +70,28 @@
   },
   "layers": {
     "add-base": "Ajouter un fond de carte ",
-    "add-overlay": "Ajouter un calque superposable",
+    "add-overlay": "Ajouter une surcouche",
+    "add-overpass": "Ajouter une requête overpass",
+    "custom-layer-name-helptext": "ex : OpenStreetMap",
+    "custom-layer-name-label": "Nom du calque",
+    "custom-layer-url-helptext-normal": "URL du calque, ex : https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Requête Overpass, ex : nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "URL ou requête du calque",
     "customize": "Personnaliser les calques",
     "opacity-slider": "Curseur d'opacité",
-    "placeholder-layer-name": "Nom du calque (p. ex. OpenStreetMap).",
-    "placeholder-layer-url": "URL du calque (p. ex. https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png).",
+    "overpass-loading-indicator": "Exécution de la requête Overpass",
     "remove-selection": "Supprimer la sélection"
   },
   "loadNogos": {
     "defaultProperties": "Propriétés par défaut",
     "file": "Fichier (.geojson)",
     "load": "Charger",
-    "nogoBuffer": "Tampon des zones interdites (en mètres) :",
-    "nogoRadius": "Rayon des zones interdites pour les points (en mètres) :",
+    "nogoBuffer": "Tampon des zones interdites (en mètres)",
+    "nogoRadius": "Rayon des zones interdites pour les points (en mètres)",
     "nogoWeight": "Poids des zones interdites (-1 signifie infranchissable)",
     "source": "Source",
     "title": "Charger les zones interdites",
-    "url": "URL :"
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "Contributeurs OpenStreetMap",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Chiffrage du coût",
     "route-quality-incline": "Chiffrage d'inclinaison",
     "route-quality-shortcut": "{{action}} (touche {{key}} pour basculer)",
+    "route-tooltip-segment": "Laisser appuyer et déplacer pour ajouter un nouveau point de passage",
+    "route-tooltip-waypoint": "Point de passage. Laisser appuyer pour déplacer ; cliquer pour supprimer.",
     "strava-biking": "Afficher les segments Strava vélo",
     "strava-running": "Afficher les segments Strava à pied",
     "strava-shortcut": "{{action}}\n(touche {{key}} pour basculer de calque, cliquer pour recharger la zone actuelle)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Dézoomer"
   },
   "modal": {
-    "close": "Fermer"
-  },
+    "close": "Fermer"},
   "navbar": {
     "about": "À propos",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Charger des zones interdites",
       "title": "Charger",
-      "tooltip": "{{tracksAction}} (touche {{tracksKey}} )\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} (touche {{tracksKey}})\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Charger des traces"
     },
     "profile": {
@@ -226,7 +234,8 @@
         "country": "Pays",
         "europe": "Europe",
         "europe-monolingual": "Europe monolingue",
-        "overlays": "Calques superposables",
+        "overlays": "Surcouches",
+        "overpass": "Lieux (PIs)",
         "worldwide": "Mondial",
         "worldwide-international": "Mondial international",
         "worldwide-monolingual": "Mondial monolingue"
@@ -240,10 +249,13 @@
       "overlay-opacity": "Transparence de la surcouche",
       "overlay-opacity_plural": "Transparence des surcouches",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Requête",
         "empty": "Aucun calque personnel trouvé.",
         "name": "Nom",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Calque",
+        "type_overlay": "Surcouche",
+        "type_overpass_query": "Requête Overpass"
       },
       "title": "Calques",
       "tooltip": "Sélection des calques"
@@ -261,10 +273,11 @@
   },
   "title": "Client web BRouter",
   "trackasroute": {
+    "browse": "Parcourir",
     "explainpoi": "(afficher les points de passage comme des PIs)",
     "explaintracklayer": "(afficher la piste comme un calque distinct)",
     "file": "Fichier de piste",
-    "fuzziness": "flou",
+    "fuzziness": "Lissage",
     "pleasewait": "Merci de patienter !",
     "showpois": "PIs",
     "title": "Charger la trace comme itinéraire",
diff --git a/locales/gl.json b/locales/gl.json
index 2898b2c..6a120b0 100644
--- a/locales/gl.json
+++ b/locales/gl.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Elevation data",
@@ -25,6 +25,7 @@
     "map-tiles": "Map tiles",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Mean cost factor",
     "meter": "meters",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total Energy",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Add base layer",
     "add-overlay": "Add overlay",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Customize layers",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Remove selection"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Load",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Source",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap contributors",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Cost coding",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Show Strava biking segments",
     "strava-running": "Show Strava running segments",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Zoom out"
   },
   "modal": {
-    "close": "Close"
-  },
+    "close": "Close"},
   "navbar": {
     "about": "About",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europe",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "More",
       "overlay-opacity": "Overlay transparency",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No custom layer configured yet.",
         "name": "Name",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Layers",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/hu.json b/locales/hu.json
index 0f677cb..71f8ee6 100644
--- a/locales/hu.json
+++ b/locales/hu.json
@@ -15,7 +15,7 @@
     "tooltip": "További információk megjelenítése a BRouter-Webről"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Közigazgatási határok: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-határok</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Magassági adatok",
@@ -25,7 +25,8 @@
     "map-tiles": "Map tiles",
     "nominatim": "Keresés: <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap közreműködők</a>, <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a> licenc szerint",
-    "title": "Credits"
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
+    "title": "Alkotók"
   },
   "export": {
     "format": "Formátum",
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Közepes ráfordítástényező",
     "meter": "méter",
     "meter-abbrev": "m",
+    "no-elevation-data": "Ehhez az útvonalhoz nincsenek magassági adatok.",
     "plain-ascend": "Végpontok közötti szintkülönbség",
     "stats-info": "A statisztika megtekintéséhez kezdjen el egy útvonalat rajzolni.",
     "total-energy": "Teljes energiafelhasználás",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Alapréteg hozzáadása",
     "add-overlay": "Rátétréteg hozzáadása",
+    "add-overpass": "Overpass-lekérdezés hozzáadása",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Egyéni réteg neve",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Egyéni réteg URL-je/lekérdezése",
     "customize": "Rétegek személyre szabása",
     "opacity-slider": "Átlátszósági csúszka",
-    "placeholder-layer-name": "Egyedi rétegnév (pl. OpenStreetMap)",
-    "placeholder-layer-url": "Egyedi réteg URL-je (pl. https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Overpass API-lekérdezés futtatása…",
     "remove-selection": "Kijelölés eltávolítása"
   },
   "loadNogos": {
     "defaultProperties": "Alapértelmezett tulajdonságok",
-    "file": "Fájl (.geojson):",
+    "file": "Fájl (.geojson)",
     "load": "Betöltés",
-    "nogoBuffer": "Elkerülendő területek körüli távolság (méter)",
-    "nogoRadius": "Elkerülendő pontok körüli sugár (méter):",
-    "nogoWeight": "Elkerülendő területek súlyozása (-1 = áthatolhatatlan):",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Forrás",
     "title": "Elkerülendő területek betöltése",
-    "url": "URL:"
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap közreműködők",
@@ -96,8 +103,8 @@
     "delete-nogo-areas": "Minden elkerülendő terület törlése",
     "delete-pois": "Minden érdekes pont (POI) törlése",
     "delete-route": "Útvonal törlése",
-    "draw-circlego-start": "Draw limited go-to zone",
-    "draw-circlego-stop": "Stop drawing limited go-to zone",
+    "draw-circlego-start": "Korlátozott elkerülendő terület rajzolása",
+    "draw-circlego-stop": "Korlátozott elkerülendő terület rajzolásának megszakítása",
     "draw-poi-start": "Érdekes pontok (POI-k) rajzolása",
     "draw-poi-stop": "Érdekes pontok rajzolásának megszakítása",
     "draw-route-start": "Útvonal rajzolása",
@@ -132,7 +139,7 @@
       "edit": "Szerkesztés kattintással",
       "help": "&square; = áthelyezés / átméretezés, <span class=\"fa fa-trash-o\"></span> = törlés,<br>a szerkesztés befejezéséhez kattintson a körre"
     },
-    "not-applicable-here": "not applicable here",
+    "not-applicable-here": "itt nem alkalmazható",
     "opacity-slider": "Útvonal és jelölők átlátszóságának beállítása",
     "opacity-slider-shortcut": "{{action}}\n(Időszakos elnémítás a {{key}} billentyűt lenyomva tartásával)",
     "preview": "Előnézet",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Ráfordítás kódolása",
     "route-quality-incline": "Lejtés kódolása",
     "route-quality-shortcut": "{{action}} (be-/kikapcsolás: {{key}} billentyű)",
+    "route-tooltip-segment": "Húzza el új útpont létrehozásához",
+    "route-tooltip-waypoint": "Útpont: mozgatáshoz húzza el, eltávolításhoz kattintson rá.",
     "strava-biking": "Strava motoros útvonalszakaszok megjelenítése",
     "strava-running": "Strava futó útvonalszakaszok megjelenítése",
     "strava-shortcut": "{{action}}\n({{key}} billentyű a réteg be-/kikapcsolásához, kattintás az adott terület újratöltéséhez)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Kicsinyítés"
   },
   "modal": {
-    "close": "Bezárás"
-  },
+    "close": "Bezárás"},
   "navbar": {
     "about": "Névjegy",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Elkerülendő területek betöltése",
       "title": "Betöltés",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} billentyű)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} billentyű)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Nyomvonalak betöltése"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Európa",
         "europe-monolingual": "Európa (egynyelvű)",
         "overlays": "Rátétrétegek",
+        "overpass": "Locations (POIs)",
         "worldwide": "Világ",
         "worldwide-international": "Világ (nemzetközi)",
         "worldwide-monolingual": "Világ (egynyelvű)"
@@ -238,11 +247,15 @@
       "optional": "Rétegek hozzáadása vagy eltávolítása",
       "optional-layers": "Több",
       "overlay-opacity": "Rátétréteg átlászósága",
+      "overlay-opacity_plural": "Rátétrétegek átlátszósága",
       "table": {
-        "URL": "URL",
+        "URL": "URL/lekérdezés",
         "empty": "Még nincs beállítva egyedi réteg",
         "name": "Név",
-        "type": "Típus"
+        "type": "Típus",
+        "type_layer": "Réteg",
+        "type_overlay": "Rátétréteg",
+        "type_overpass_query": "Overpass-lekérdezés"
       },
       "title": "Rétegek",
       "tooltip": "Rétegek kijelölése"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter webkliens",
   "trackasroute": {
+    "browse": "Böngészése",
     "explainpoi": "(útpontok megjelenítése érdekes pontként [POI-ként])",
     "explaintracklayer": "(nyomvonal megjelenítés különálló rétegként)",
     "file": "Nyomvonalfájl",
-    "fuzziness": "homályosság",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Kérjük, várjon",
     "showpois": "Érdekes pontok (POI-k)",
     "title": "Nyomvonal betöltése útvonalként",
@@ -283,7 +297,7 @@
     "upload-error": "Feltöltési hiba: {{error}}"
   },
   "whatsnew": {
-    "new-version": "A new version was released since your last visit. Click <a href='.' data-toggle='modal' data-target='#whatsnew'>here</a> to see what's new!",
-    "title": "What's new?"
+    "new-version": "Legutóbbi látogatása óta megjelent egy új verzió. <a href='.' data-toggle='modal' data-target='#whatsnew'>Kattintson ide</a>, és nézze meg az újdonságokat!",
+    "title": "Újdonságok"
   }
 }
diff --git a/locales/is.json b/locales/is.json
index 84fa07e..b1ea767 100644
--- a/locales/is.json
+++ b/locales/is.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Hæðargögn",
@@ -25,6 +25,7 @@
     "map-tiles": "Kortatíglar",
     "nominatim": "Leita eftir <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap þátttakendur</a> með <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Meðal-kostnaðarstuðull",
     "meter": "metrar",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Einföld hækkun (hæðarmunur)",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Orka alls",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Bæta við grunnlagi",
     "add-overlay": "Bæta við þekjulagi",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Sérsníða lög",
     "opacity-slider": "Ógegnsæissleði",
-    "placeholder-layer-name": "Heiti sérsniðins lags. (t.d: OpenStreetMap)",
-    "placeholder-layer-url": "URL-slóð sérsniðins lags. (t.d: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Fjarlægja valið"
   },
   "loadNogos": {
     "defaultProperties": "Sjálfgefnir eiginleikar",
-    "file": "Skrá (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Hlaða",
-    "nogoBuffer": "Útjaðar bannsvæða (í metrum):",
-    "nogoRadius": "Radíus bannsvæða í kringum punkt (í metrum):",
-    "nogoWeight": "Mikilvægi bannsvæðis (-1 þýðir ófært): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Uppruni",
     "title": "Hlaða inn bannsvæðum",
-    "url": "Slóð:"
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap þátttakendurnir",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Kóði fyrir kostnað",
     "route-quality-incline": "Kóði fyrir halla",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Sýna Strava hjólabúta",
     "strava-running": "Sýna Strava hlaupabúta",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Renna frá"
   },
   "modal": {
-    "close": "Loka"
-  },
+    "close": "Loka"},
   "navbar": {
     "about": "Um hugbúnaðinn",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Hlaða inn bannsvæðum",
       "title": "Hlaða",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Evrópa",
         "europe-monolingual": "Eitt tungumál í Evrópu",
         "overlays": "Þekjulög (yfirlög)",
+        "overpass": "Locations (POIs)",
         "worldwide": "Á heimsvísu",
         "worldwide-international": "Alþjóðlegt á heimsvísu",
         "worldwide-monolingual": "Eitt tungumál á heimsvísu"
@@ -238,11 +247,15 @@
       "optional": "Bæta við eða fjarlægja valkvæð lög",
       "optional-layers": "Meira",
       "overlay-opacity": "Gegnsæi þekjulags",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "Slóð",
+        "URL": "URL/Query",
         "empty": "Ekkert sérsniðið lag ennþá uppsett.",
         "name": "Nafn",
-        "type": "Tegund"
+        "type": "Tegund",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Lög",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter vefforrit",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/it.json b/locales/it.json
index 648b507..4d7f48c 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -15,7 +15,7 @@
     "tooltip": "Mostra più informazioni su BRouter-Web"
   },
   "credits": {
-    "boundaries": "Limiti amministrativi: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Limiti amministrativi: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Dati d'elevazione",
@@ -25,6 +25,7 @@
     "map-tiles": "Sezioni di mappa",
     "nominatim": "Ricerca con <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> in <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Posizioni (PDI): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "fattore di costo medio",
     "meter": "metri",
     "meter-abbrev": "m",
+    "no-elevation-data": "Nessuna elevazione disponibile per questo tragitto.",
     "plain-ascend": "Salita leggera",
     "stats-info": "Crea un percorso per ottenere statistiche",
     "total-energy": "Energia totale",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Aggungi mappa di base",
     "add-overlay": "Aggungi sovvraposizione",
+    "add-overpass": "Aggiungi richiesta overpass",
+    "custom-layer-name-helptext": "ad es.: OpenStreetMap",
+    "custom-layer-name-label": "nome livello personalizzato",
+    "custom-layer-url-helptext-normal": "URL per livelli normali, ad es.: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Richiesta Overpass, ad es.: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Livello URL/Richiesta personalizzato",
     "customize": "Personalizza i layer",
     "opacity-slider": "Barra di scorrimento per l'opacità",
-    "placeholder-layer-name": "Nome del layer personalizzato. (es: OpenStreetMap)",
-    "placeholder-layer-url": "URL del layer personalizzato. (es: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Esecuzione della richiesta alle API Overpass…",
     "remove-selection": "Annulla selezione"
   },
   "loadNogos": {
     "defaultProperties": "Proprietà di default",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Carica",
-    "nogoBuffer": "Tampone delle zone no-go (in metri):",
-    "nogoRadius": "Raggio no-go per punti (in metri):",
-    "nogoWeight": "Peso no-go (-1 significa intransitabile)",
+    "nogoBuffer": "Cuscinetto delle aree vietate (in metri)",
+    "nogoRadius": "Raggio vietato per i punti (in metri)",
+    "nogoWeight": "Peso vietato (-1 significa impraticabile)",
     "source": "Fonte",
     "title": "Carica zone no-go",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "Contributori OpenStreetMap",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Codificazione costo",
     "route-quality-incline": "Codificazione pendenza",
     "route-quality-shortcut": "{{action}} (tasto {{key}} per dis-/attivare)",
+    "route-tooltip-segment": "Trascina per creare un nuovo waypoint",
+    "route-tooltip-waypoint": "Waypoint. Trascina per spostarlo. Clicca per rimuoverlo.",
     "strava-biking": "Visualizza segmenti Strava bici",
     "strava-running": "Visualizza segmenti Strava corsa",
     "strava-shortcut": "{{action}}\n(tasto {{key}} per dis-/attivare layer, clicca per ricarichare la zona in vista)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Zoom indietro"
   },
   "modal": {
-    "close": "Chiudi"
-  },
+    "close": "Chiudi"},
   "navbar": {
     "about": "A proposito",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Carica zone no-go",
       "title": "Carica",
-      "tooltip": "{{tracksAction}} (tasto {{tracksKey}})\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} (tasto {{tracksKey}})\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Carica traccie"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europa",
         "europe-monolingual": "Europa monolingua",
         "overlays": "Sovvraposizioni",
+        "overpass": "Posizioni (PDI)",
         "worldwide": "Mondiale",
         "worldwide-international": "Mondiale internazionale",
         "worldwide-monolingual": "Mondiale monolingua"
@@ -238,11 +247,15 @@
       "optional": "Aggiungi o rimuovi layer opzionali",
       "optional-layers": "Più",
       "overlay-opacity": "Trasparenza sovvraposizione",
+      "overlay-opacity_plural": "Trasparenza delle sovrapposizioni",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Richiesta",
         "empty": "Nessun layer personalizzato definito finora.",
         "name": "Nome",
-        "type": "Tipo"
+        "type": "Tipo",
+        "type_layer": "Livello",
+        "type_overlay": "Sovrapposizione",
+        "type_overpass_query": "Richiesta Overpass"
       },
       "title": "Layer",
       "tooltip": "Scegli layer"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Sfoglia",
     "explainpoi": "(visualizza waypoints come POI's)",
     "explaintracklayer": "(visualizza traccia come layer distinto)",
     "file": "File traccia",
-    "fuzziness": "sfocatura",
+    "fuzziness": "Sfocatura",
     "pleasewait": "Attendere prego!",
     "showpois": "POI",
     "title": "Carica traccia come percorso",
@@ -280,10 +294,10 @@
     "strava-error": "Errore nel recupero dei segmenti Strava: {{error}}",
     "temporary-profile": "<strong>Nota:</strong> Profili personalizzati carichati si trovano solo temporaneamente nel cache del server. <br/>Si prega di salvare le modificazioni localmente sul suo PC.",
     "tracks-load-error": "Errore caricando traccie: {{error}}",
-    "upload-error": "Upload error: {{error}}"
+    "upload-error": "Errore di caricamento: {{error}}"
   },
   "whatsnew": {
-    "new-version": "A new version was released since your last visit. Click <a href='.' data-toggle='modal' data-target='#whatsnew'>here</a> to see what's new!",
-    "title": "What's new?"
+    "new-version": "Dalla tua ultima visita è stata rilasciata una nuova versione. Clicca <a href='.' data-toggle='modal' data-target='#whatsnew'>qua</a> per sapere cosa è cambiato!",
+    "title": "Novità"
   }
 }
diff --git a/locales/keys.js b/locales/keys.js
index 498a56c..ceba32f 100644
--- a/locales/keys.js
+++ b/locales/keys.js
@@ -61,4 +61,5 @@ i18next.t('sidebar.layers.category.overlays', 'Overlays');
 i18next.t('sidebar.layers.category.worldwide', 'Worldwide');
 i18next.t('sidebar.layers.category.worldwide-international', 'Worldwide international');
 i18next.t('sidebar.layers.category.worldwide-monolingual', 'Worldwide monolingual');
+i18next.t('sidebar.layers.category.overpass', 'Locations (POIs)');
 i18next.t('sidebar.layers.tooltip');
diff --git a/locales/nb.json b/locales/nb.json
index fea60ae..ed889f0 100644
--- a/locales/nb.json
+++ b/locales/nb.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Høydedata",
@@ -25,6 +25,7 @@
     "map-tiles": "Kartfliser",
     "nominatim": "Søk av <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap-bidragsytere</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Gjennomsnittelig kostnadsfaktor",
     "meter": "meter",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Stigning",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total energi",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Legg til grunnlag",
     "add-overlay": "Legg til overlag",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Tilpass lag",
     "opacity-slider": "Gjennomsiktelighet",
-    "placeholder-layer-name": "Egendefinert lagnavn. (eks. OpenStreetMap)",
-    "placeholder-layer-url": "Egendefinert lag-URL. (eks. https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Fjern utvalg"
   },
   "loadNogos": {
     "defaultProperties": "Standardegenskaper",
-    "file": "Fil (.geojson):",
+    "file": "File (.geojson)",
     "load": "Last",
-    "nogoBuffer": "Lag buffer rundt no-go områder (i meter):",
-    "nogoRadius": "No-go radius for punkter (i meter):",
-    "nogoWeight": "Vekt på no-go (-1 betyr ugjennomtrengbar)",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Kilde",
     "title": "Last no-go områder",
-    "url": "URL:"
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap-bidragsytere",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Kostnad-koding",
     "route-quality-incline": "Stigning-koding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Vis Strava sykkel-segmenter",
     "strava-running": "Vis Strava løpe-segmenter",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Zoom ut"
   },
   "modal": {
-    "close": "Lukk"
-  },
+    "close": "Lukk"},
   "navbar": {
     "about": "Om",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Last",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europa",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "Mer",
       "overlay-opacity": "Overleggs transparens",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "Ingen tilpasset lag konfigurert ennå.",
         "name": "Navn",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Lag",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/nl.json b/locales/nl.json
index 54f225b..1c481ce 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -1,31 +1,32 @@
 {
   "about": {
     "bug-reports": "Foutrapporten en verzoeken:",
-    "bug-reports-back": "server / backend, routing engine, Android app, profiles, brouter.de site",
-    "bug-reports-front": "web client / frontend.",
+    "bug-reports-back": "server / backend, routebepaling, Android app, profielen, brouter.de site",
+    "bug-reports-front": "website / frontend.",
     "chat": "Chat met gebruikers en ontwikkelaars",
     "contact": "Contact:",
     "contact-language": "Bij voorkeur in Engels omdat we internationale ontwikkelaars en gebruikers hebben",
-    "data": "Data:",
-    "data-description": "This is based on <a href=\"https://www.openstreetmap.org\" target=\"_blank\">OpenStreetMap</a>. It is usually updated daily, see dates of <a href=\"https://brouter.de/brouter/segments4/\" target=\"_blank\">data files</a>.",
-    "description": "Online service of the BRouter routing engine. For the offline Android app and more information see <a href=\"https://brouter.de/\" target=\"_blank\">brouter.de</a>",
-    "details": "<i><a href=\"{{privacyPolicyUrl}}\" target=\"_blank\">Privacy Policy</a></i>, \n<i><a href=\"https://github.com/nrenner/brouter-web#credits-and-licenses\" target=\"_blank\">Credits</a></i>,\n<i><a href=\"https://github.com/nrenner/brouter-web/blob/master/CHANGELOG.md\" target=\"_blank\">Changelog</a></i> and\n<i><a href=\"https://github.com/nrenner/brouter-web#readme\" target=\"_blank\">more info</a></i> on the client.",
+    "data": "Gegevens:",
+    "data-description": "Dit is gebaseerd op <a href=\"https://www.openstreetmap.org\" target=\"_blank\">OpenStreetMap</a>. Het wordt normaal gesproken dagelijks geüpdated, zie data van <a href=\"https://brouter.de/brouter/segments4/\" target=\"_blank\">gegevensbestanden</a>.",
+    "description": "Online dienst van de BRouter routebepaling. Voor de offline Android app en meer informatie, zie <a href=\"https://brouter.de/\" target=\"_blank\">brouter.de</a>",
+    "details": "<i><a href=\"{{privacyPolicyUrl}}\" target=\"_blank\">Privacybeleid</a></i>, \n<i><a href=\"https://github.com/nrenner/brouter-web#credits-and-licenses\" target=\"_blank\">Dank aan</a></i>,\n<i><a href=\"https://github.com/nrenner/brouter-web/blob/master/CHANGELOG.md\" target=\"_blank\">Wijzigingen</a></i> en\n<i><a href=\"https://github.com/nrenner/brouter-web#readme\" target=\"_blank\">meer informatie</a></i> over de website.",
     "support": "Algemene discussies/vragen, ondersteuning",
     "title": "Over",
-    "tooltip": "Show more information about BRouter-Web"
+    "tooltip": "Toon meer informatie over BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administratieve Grenzen: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Grenzen</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Hoogtedata",
-    "esri-license": "<a target=\"_blank\" href=\"http://goto.arcgisonline.com/maps/World_Imagery\">World Imagery</a> &copy; <a target=\"_blank\" href=\"https://www.esri.com/\">Esri</a>, sources: Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, and the GIS User Community",
+    "esri-license": "<a target=\"_blank\" href=\"http://goto.arcgisonline.com/maps/World_Imagery\">Satellietfotografie</a> &copy; <a target=\"_blank\" href=\"https://www.esri.com/\">Esri</a>, bronnen: Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, en de GIS User Community",
     "esri-tiles": "Esri World Imagery",
-    "map-data": "Map data",
-    "map-tiles": "Map tiles",
+    "map-data": "Kaartgegevens",
+    "map-tiles": "Kaarttegels",
     "nominatim": "Zoek met <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
-    "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
-    "title": "Credits"
+    "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap bijdragers</a> onder <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locaties (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
+    "title": "Dank aan"
   },
   "export": {
     "format": "Formaat",
@@ -33,8 +34,8 @@
     "format_geojson": "GeoJSON",
     "format_gpx": "GPX",
     "format_kml": "KML",
-    "include": "Include",
-    "include_waypoints": "Waypoints",
+    "include": "Inclusief",
+    "include_waypoints": "Routepunten",
     "route-from-to": "{{from}} -> {{to}} ({{distance}}km)",
     "route-loop": "{{from}} ({{distance}}km)",
     "title": "Exporteer route",
@@ -47,7 +48,7 @@
     "elevation-chart": "Hoogtekaart aan/uit",
     "energy-per-100km": "Energie per 100 km",
     "hours": "uren",
-    "hours-abbrev": "h",
+    "hours-abbrev": " uur",
     "kilometer": "kilometers",
     "kilometer-abbrev": "km",
     "kilowatthour": "kilowattuur",
@@ -55,58 +56,64 @@
     "mean-cost-factor": "Gemiddelde kosten",
     "meter": "meters",
     "meter-abbrev": "m",
-    "plain-ascend": "Plain ascend",
-    "stats-info": "Start drawing a route to get stats.",
+    "no-elevation-data": "Geen hoogtegegevens beschikbaar voor deze route.",
+    "plain-ascend": "Vlakke stijging",
+    "stats-info": "Teken een route om gegevens te zien.",
     "total-energy": "Totale energie",
     "travel-time": "Reistijd"
   },
   "keyboard": {
     "backspace": "Backspace",
     "escape": "Escape",
-    "generic-shortcut": "{{action}} ({{key}} key)",
+    "generic-shortcut": "{{action}} ({{key}} toets)",
     "shift": "Shift"
   },
   "layers": {
     "add-base": "Voeg basislaag toe",
-    "add-overlay": "Add overlay",
+    "add-overlay": "Voeg overlaag toe",
+    "add-overpass": "Voeg Overpass aanvraag toe",
+    "custom-layer-name-helptext": "bijv.: OpenStreetMap",
+    "custom-layer-name-label": "Eigen laag naam",
+    "custom-layer-url-helptext-normal": "URL voor normale lagen, bijv.: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass aanvraag, bijv.: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Eigen laag URL/Aanvraag",
     "customize": "Pas lagen aan",
-    "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Eigen laag naam. (bijv: OpenStreetMap)",
-    "placeholder-layer-url": "Eigen laag URL. (bijv: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "opacity-slider": "Transparantie",
+    "overpass-loading-indicator": "Overpass API aanvraag draaien...",
     "remove-selection": "Verwijder selectie"
   },
   "loadNogos": {
-    "defaultProperties": "Default properties",
+    "defaultProperties": "Standaard eigenschappen",
     "file": "Bestand (.geojson)",
     "load": "Laad",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go gewicht (-1 betekent nooit doorheen):",
-    "source": "Source",
+    "nogoBuffer": "Buffer no-go gebieden (in meter)",
+    "nogoRadius": "no-go radius voor punten (in meter)",
+    "nogoWeight": "No-go gewicht (-1 betekent nooit doorheen)",
+    "source": "Bron",
     "title": "Laad no-go gebieden",
-    "url": "URL:"
+    "url": "URL"
   },
   "map": {
-    "attribution-osm-long": "OpenStreetMap contributors",
+    "attribution-osm-long": "OpenStreetMap bijdragers",
     "attribution-osm-short": "OpenStreetMap",
     "clear-route": "Wis route data",
     "copyright": "Copyright",
     "cycling": "Fietsen",
     "delete-last-point": "Verwijder laatste punt",
     "delete-nogo-areas": "Verwijder alle no-go gebieden",
-    "delete-pois": "Delete all points of interest",
+    "delete-pois": "Verwijder alle locaties",
     "delete-route": "Verwijder route",
-    "draw-circlego-start": "Draw limited go-to zone",
-    "draw-circlego-stop": "Stop drawing limited go-to zone",
-    "draw-poi-start": "Draw points of interest",
-    "draw-poi-stop": "Stop drawing points of interest",
+    "draw-circlego-start": "Teken beperkte ga-naar zone",
+    "draw-circlego-stop": "Beëindig tekenen van beperkte ga-naar zone",
+    "draw-poi-start": "Teken locaties",
+    "draw-poi-stop": "Beëindig tekenen van locaties",
     "draw-route-start": "Teken route",
     "draw-route-stop": "Beëindig tekenen",
-    "enter-poi-name": "Enter Point of Interest name",
+    "enter-poi-name": "Voer naam in van locatie",
     "geocoder": "Zoek",
     "geocoder-placeholder": "Zoek...",
     "hikebike-hillshading": "Bergschaduw",
-    "hiking": "Hiking",
+    "hiking": "Wandelen",
     "layer": {
       "bing": "Bing Aerial",
       "cycle": "OpenCycleMap (Thunderf.)",
@@ -120,37 +127,38 @@
       "outdoors": "Outdoors (Thunderforest)",
       "route-quality": "Routekwaliteitscodering",
       "stamen-terrain": "Terrain (Stamen)",
-      "strava-segments": "Strava segments",
+      "strava-segments": "Strava segmenten",
       "topo": "OpenTopoMap"
     },
-    "loading": "Loading…",
+    "loading": "Laden…",
     "locate-me": "Laat zien waar ik ben",
     "nogo": {
-      "cancel": "Cancel drawing no-go area",
+      "cancel": "Beëinig tekenen no-go gebied",
       "click-drag": "Klik en sleep om een cirkel te tekenen",
       "draw": "Teken rond no-go gebied",
-      "edit": "Click to edit",
-      "help": "&square; = move / resize, <span class=\"fa fa-trash-o\"></span> = delete,<br>click circle to quit editing"
+      "edit": "Klik om te wijzigen",
+      "help": "&square; = verplaats / wijzig formaat, <span class=\"fa fa-trash-o\"></span> = verwijder,<br>klik de cirkel om wijzigen te beëindig"
     },
-    "not-applicable-here": "not applicable here",
-    "opacity-slider": "Set transparency of route track and markers",
-    "opacity-slider-shortcut": "{{action}}\n(Hold {{key}} key to mute temporarily)",
+    "not-applicable-here": "hier niet mogelijk",
+    "opacity-slider": "Stel transparantie van route track en punten in",
+    "opacity-slider-shortcut": "{{action}}\n(Houd {{key}} toets om tijdelijk te dempen)",
     "preview": "Voorvertoning",
     "privacy": "Privacy",
     "reverse-route": "Draai route om",
     "route-quality-altitude": "Hoogtecodering",
     "route-quality-cost": "Kostencodering",
     "route-quality-incline": "Stijgingcodering",
-    "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
-    "strava-biking": "Show Strava biking segments",
-    "strava-running": "Show Strava running segments",
-    "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
+    "route-quality-shortcut": "{{action}} ({{key}} toets om te schakelen)",
+    "route-tooltip-segment": "Sleep om een nieuw routepunt te maken",
+    "route-tooltip-waypoint": "Routepunt. Sleep om te verplaatsen; klik om te verwijderen.",
+    "strava-biking": "Toon Strava fietssegmenten",
+    "strava-running": "Toon Strava hardloopsegmenten",
+    "strava-shortcut": "{{action}}\n({{key}} toets om laag te schakelen, klik om huidig gebied opnieuw te laden)",
     "zoomInTitle": "Zoom in",
     "zoomOutTitle": "Zoom uit"
   },
   "modal": {
-    "close": "Afsluiten"
-  },
+    "close": "Afsluiten"},
   "navbar": {
     "about": "Over",
     "alternative": {
@@ -159,22 +167,22 @@
       "second": "2e alternatief",
       "third": "3e alternatief"
     },
-    "export": "Export",
-    "export-tooltip": "Export route",
+    "export": "Exporteer",
+    "export-tooltip": "Exporteer route",
     "load": {
       "nogos": "Laad no-go gebieden",
       "title": "Laad",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
-      "tracks": "Load tracks"
+      "tooltip": "{{tracksAction}} ({{tracksKey}} toets)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
+      "tracks": "Laad tracks"
     },
     "profile": {
       "car-eco": "Auto (economisch)",
       "car-fast": "Auto (snel)",
       "car-test": "Auto (test)",
       "custom": "Aangepast",
-      "fastbike": "Fastbike",
-      "fastbike-asia-pacific": "Fastbike (Asia Pacific)",
-      "fastbike-lowtraffic": "Fastbike (low traffic)",
+      "fastbike": "Snelfiets",
+      "fastbike-asia-pacific": "Snelfiets (Azië Stille Oceaan)",
+      "fastbike-lowtraffic": "Snelfiets (weinig verkeer)",
       "hiking-beta": "Wandelen (beta)",
       "moped": "Bromfiets",
       "rail": "Trein",
@@ -189,13 +197,13 @@
       "vm-forum-liegerad-schnell": "Ligfiets (snel)",
       "vm-forum-velomobil-schnell": "Ligfiets (snel)"
     },
-    "profile-tooltip": "\n({{key}} key to switch)"
+    "profile-tooltip": "\n({{key}} toets om te schakelen)"
   },
   "sidebar": {
     "analysis": {
       "header": {
-        "highway": "Highway",
-        "smoothness": "Smoothness",
+        "highway": "Weg",
+        "smoothness": "Gladheid",
         "surface": "Oppervlakte"
       },
       "table": {
@@ -213,8 +221,8 @@
     },
     "data": {
       "sync-map": "Synchroniseer kaart",
-      "title": "Data",
-      "tooltip": "Show detailed route data table"
+      "title": "Gegevens",
+      "tooltip": "Toon gedetaileerde routegegevenstabel"
     },
     "itinerary": {
       "title": "Routebeschrijving",
@@ -225,24 +233,29 @@
         "base-layers": "Basislagen",
         "country": "Land",
         "europe": "Europa",
-        "europe-monolingual": "Europe monolingual",
-        "overlays": "Overlays",
+        "europe-monolingual": "Europees eentalig",
+        "overlays": "Overlagen",
+        "overpass": "Locaties (POIs)",
         "worldwide": "Wereldwijd",
-        "worldwide-international": "Worldwide international",
-        "worldwide-monolingual": "Worldwide monolingual"
+        "worldwide-international": "Wereldwijd internationaal",
+        "worldwide-monolingual": "Wereldwijd eentalig"
       },
-      "collapse": "Collapse all",
-      "custom-layers": "Custom layers",
-      "customize": "Add or remove custom layers",
-      "expand": "Expand all",
-      "optional": "Add or remove optional layers",
-      "optional-layers": "More",
-      "overlay-opacity": "Overlay transparency",
+      "collapse": "Klap alles in",
+      "custom-layers": "Eigen lagen",
+      "customize": "Voeg toe of verwijder eigen lagen",
+      "expand": "Klap alles uit",
+      "optional": "Voeg toe of verwijder optionele lagen",
+      "optional-layers": "Meer",
+      "overlay-opacity": "Overlaag transparantie",
+      "overlay-opacity_plural": "Overlagen transparantie",
       "table": {
-        "URL": "URL",
-        "empty": "No custom layer configured yet.",
+        "URL": "URL/Aanvraag",
+        "empty": "Nog geen eigen laag geconfigureerd.",
         "name": "Naam",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Laag",
+        "type_overlay": "Overlaag",
+        "type_overpass_query": "Overpass Aanvraag"
       },
       "title": "Lagen",
       "tooltip": "Selecteer lagen"
@@ -251,39 +264,40 @@
       "apply": "Pas toe",
       "clear": "Wis",
       "help": "Help",
-      "no_easy_configuration_warning": "No easy configuration is available for this profile.",
+      "no_easy_configuration_warning": "Geen gemakkelijke configuratie gevonden voor dit profiel",
       "options": "Opties",
       "placeholder": "Schrijf je eigen profiel hier.",
       "profile": "Profiel"
     },
-    "tab-tooltip": "{{action}}\n({{toggleKey}} key to toggle, {{switchKey}} to switch to next tab)"
+    "tab-tooltip": "{{action}}\n({{toggleKey}} toets om te schakelen, {{switchKey}} om naar volgende tab te wisselen)"
   },
-  "title": "BRouter web client",
+  "title": "BRouter website",
   "trackasroute": {
-    "explainpoi": "(show waypoints as POI's)",
-    "explaintracklayer": "(show Track as separate Layer)",
-    "file": "Trackfile",
-    "fuzziness": "fuzziness",
-    "pleasewait": "Please wait!",
+    "browse": "Bladeren",
+    "explainpoi": "(toon routepunten als POI's)",
+    "explaintracklayer": "(toon Track als losse Laag)",
+    "file": "Trackbestand",
+    "fuzziness": "Onnauwkeurigheid",
+    "pleasewait": "Wacht alstublieft!",
     "showpois": "POI's",
-    "title": "Load Track as Route",
-    "tracklayer": "Track Layer",
-    "tuning": "Tuning"
+    "title": "Laad Track als Route",
+    "tracklayer": "Track Laag",
+    "tuning": "Afstelling"
   },
   "warning": {
     "cannot-get-route": "Fout bij ophalen route URL",
-    "invalid-route-from": "Start marker is too far from a route.",
-    "invalid-route-to": "Destination marker is too far from a route.",
+    "invalid-route-from": "Beginpunt is te ver van een route.",
+    "invalid-route-to": "Eindpunt is te ver van een route.",
     "no-response": "geen antwoord van server",
     "no-route-found": "Fout: Kan geen route vinden voor de gegeven punten.\nProbeer de punten dichter bij wegen te plaatsen",
     "profile-error": "Profielfout: geen of leeg antwoord van server",
-    "strava-error": "Error getting Strava segments: {{error}}",
-    "temporary-profile": "<strong>Note:</strong> Uploaded custom profiles are only cached temporarily on the server.<br/>Please save your edits to your local PC.",
-    "tracks-load-error": "Error loading tracks: {{error}}",
-    "upload-error": "Upload error: {{error}}"
+    "strava-error": "Fout tijdens ophalen Strava segmenten: {{error}}",
+    "temporary-profile": "<strong>Belangrijk:</strong> Geüploade aanpepaste profielen worden slechts tijdelijk op de server opgeslagen.<br/>Sla uw wijzigingen lokaal op op uw PC.",
+    "tracks-load-error": "Fout tijdens laden tracks: {{error}}",
+    "upload-error": "Uploadfout: {{error}}"
   },
   "whatsnew": {
-    "new-version": "A new version was released since your last visit. Click <a href='.' data-toggle='modal' data-target='#whatsnew'>here</a> to see what's new!",
-    "title": "What's new?"
+    "new-version": "Een nieuwe versie is gepubliceerd sinds uw laatste bezoek. Klik <a href='.' data-toggle='modal' data-target='#whatsnew'>hier</a> om te zien wat er is veranderd!",
+    "title": "Wat is er veranderd?"
   }
 }
diff --git a/locales/pl.json b/locales/pl.json
index 6e18bac..08a5939 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -5,7 +5,7 @@
     "bug-reports-front": "klient przeglądarkowy / interfejs.",
     "chat": "Czat z użytkownikami i twórcami",
     "contact": "Kontakt:",
-    "contact-language": "Preferowanym językiem jest angielski, ponieważ mamy zarówno międzynarodowych edytorów jak i użytkowników.",
+    "contact-language": "Preferowanym językiem jest angielski, ponieważ mamy zarówno międzynarodowych edytorów, jak i użytkowników.",
     "data": "Dane:",
     "data-description": "Oparta jest na <a href=\"https://www.openstreetmap.org\" target=\"_blank\">OpenStreetMap</a>. Zazwyczaj aktualizowana jest codziennie, zobacz daty <a href=\"https://brouter.de/brouter/segments4/\" target=\"_blank\">plików z danymi</a>.",
     "description": "Dostęp online do silnika wyznaczania tras BRouter. Aplikację offline na Androida i więcej informacji znajdziesz na <a href=\"https://brouter.de/\" target=\"_blank\">brouter.de</a>",
@@ -15,7 +15,7 @@
     "tooltip": "Pokaż więcej informacji o BRouter-Web"
   },
   "credits": {
-    "boundaries": "Granice Administracyjne: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Granice Administracyjne: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Dane wysokościowe",
@@ -25,6 +25,7 @@
     "map-tiles": "Kafelki mapy",
     "nominatim": "Wyszukaj przez <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >Autorzy OpenStreetMap</a> na licencji <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Punkty zainteresowań (POI): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Wkład"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Średni współczynnik kosztów",
     "meter": "metrów",
     "meter-abbrev": "m",
+    "no-elevation-data": "Dla tej trasy nie są dostępne informacje o wysokości.",
     "plain-ascend": "Różnica wysokości",
     "stats-info": "Zacznij rysować trasę, aby zobaczyć statystyki.",
     "total-energy": "Całkowita energia",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Dodaj warstwę bazową",
     "add-overlay": "Dodaj nakładkę",
+    "add-overpass": "Dodaj zapytanie overpass",
+    "custom-layer-name-helptext": "np: OpenStreetMap",
+    "custom-layer-name-label": "Nazwa warstwy",
+    "custom-layer-url-helptext-normal": "URL warstw podstawowych, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Zapytanie Overpass, np. nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "URL/zapytanie warstwy użytkownika",
     "customize": "Dostosuj warstwy",
     "opacity-slider": "Suwak pokrycia",
-    "placeholder-layer-name": "Nazwa warstwy (np. OpenStreetMap)",
-    "placeholder-layer-url": "URL warstwy (np. https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Zapytanie Overpass API w trakcie ...",
     "remove-selection": "Usuń zaznaczenie"
   },
   "loadNogos": {
     "defaultProperties": "Domyślne właściwości",
-    "file": "Plik (.geojson): ",
+    "file": "Plik (.geojson)",
     "load": "Wczytaj",
-    "nogoBuffer": "Bufor obszarów omijania (w metrach):",
-    "nogoRadius": "Promień punktów (w metrach):",
-    "nogoWeight": "Waga obszaru omijania (-1 to nieprzejezdne):",
+    "nogoBuffer": "Zakres ładowania obszarów omijania (w metrach)",
+    "nogoRadius": "Promień obszaru omijania dla punktów (w metrach)",
+    "nogoWeight": "Waga obszaru omijania (-1 oznacza całkowicie nieprzejezdny)",
     "source": "Źródło",
     "title": "Wczytaj obszary omijania",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "Autorzy OpenStreetMap",
@@ -96,8 +103,8 @@
     "delete-nogo-areas": "Usuń wszystkie obszary omijania",
     "delete-pois": "Usuń wszystkie punkty zainteresowania",
     "delete-route": "Usuń trasę",
-    "draw-circlego-start": "Draw limited go-to zone",
-    "draw-circlego-stop": "Stop drawing limited go-to zone",
+    "draw-circlego-start": "Rysuj obszar ograniczenia trasy",
+    "draw-circlego-stop": "Zakończ rysowanie obszaru ograniczenia trasy",
     "draw-poi-start": "Rysuj punkty zainteresowania",
     "draw-poi-stop": "Przestań rysować punkty zainteresowania",
     "draw-route-start": "Rysuj trasę",
@@ -134,23 +141,24 @@
     },
     "not-applicable-here": "tutaj niemożliwe",
     "opacity-slider": "Ustaw przezroczystość trasy i wskaźników",
-    "opacity-slider-shortcut": "{{action}}\n(Hold {{key}} key to mute temporarily)",
+    "opacity-slider-shortcut": "{{action}}\n(prztrzymaj klawisz {{key}} aby czasowo ukryć)",
     "preview": "Podgląd",
     "privacy": "Prywatność",
     "reverse-route": "Odwróć trasę",
     "route-quality-altitude": "Kodowanie wysokości",
     "route-quality-cost": "Kodowanie kosztów",
     "route-quality-incline": "Kodowanie nachylenia",
-    "route-quality-shortcut": "{{action}} (naciśnij {{key}}, aby przełączyć)",
+    "route-quality-shortcut": "{{action}} (naciśnij {{key}} aby przełączyć)",
+    "route-tooltip-segment": "Przeciągnij aby dodać punkt trasy",
+    "route-tooltip-waypoint": "Punkt trasy. Przeciągnij aby przenieść; Kliknij aby usunąć.",
     "strava-biking": "Pokaż rowerowe segmenty Strava ",
     "strava-running": "Pokaż biegowe segmenty Strava",
-    "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
+    "strava-shortcut": "{{action}}\n(klawisz {{key}} aby przełączyć widoczność warstwy, kliknij aby odświeżyć w bieżącym obszarze)",
     "zoomInTitle": "Przybliż",
     "zoomOutTitle": "Oddal"
   },
   "modal": {
-    "close": "Zamknij"
-  },
+    "close": "Zamknij"},
   "navbar": {
     "about": "Informacje",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Wczytaj obszary omijania",
       "title": "Wczytaj",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} (klawisz {{tracksKey}})\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Wczytaj ślady"
     },
     "profile": {
@@ -189,7 +197,7 @@
       "vm-forum-liegerad-schnell": "Rower poziomy (szosowy)",
       "vm-forum-velomobil-schnell": "Velomobile (szosowy)"
     },
-    "profile-tooltip": "\n({{key}} key to switch)"
+    "profile-tooltip": "\n(naciśnij {{key}} aby przełączyć)"
   },
   "sidebar": {
     "analysis": {
@@ -205,7 +213,7 @@
         "unknown": "Nieznana"
       },
       "title": "Analiza",
-      "tooltip": "Analyse route"
+      "tooltip": "Analizuj trasę"
     },
     "customize-profile": {
       "title": "Dostosuj profil",
@@ -214,11 +222,11 @@
     "data": {
       "sync-map": "Synchronizacja mapy",
       "title": "Dane",
-      "tooltip": "Show detailed route data table"
+      "tooltip": "Pokaż szczegółową tabelę trasy"
     },
     "itinerary": {
       "title": "Plan podróży",
-      "tooltip": "Show itinerary"
+      "tooltip": "Pokaż plan podróży"
     },
     "layers": {
       "category": {
@@ -227,6 +235,7 @@
         "europe": "Europa",
         "europe-monolingual": "Europa (mapy jednojęzyczne)",
         "overlays": "Nakładki",
+        "overpass": "Punkty zainteresowań (POI)",
         "worldwide": "Cały świat",
         "worldwide-international": "Świat",
         "worldwide-monolingual": "Świat (mapy jednojęzyczne)"
@@ -238,11 +247,15 @@
       "optional": "Dodaj lub usuń opcjonalne warstwy",
       "optional-layers": "Więcej",
       "overlay-opacity": "Przezroczystość nakładki",
+      "overlay-opacity_plural": "Przezroczystość nakładek",
       "table": {
-        "URL": "URL",
+        "URL": "URL/zapytanie",
         "empty": "Nie skonfigurowano jeszcze niestandardowych warstw.",
         "name": "Nazwa",
-        "type": "Rodzaj"
+        "type": "Rodzaj",
+        "type_layer": "Warstwa",
+        "type_overlay": "Nakładka",
+        "type_overpass_query": "Zapytanie Overpass"
       },
       "title": "Warstwy",
       "tooltip": "Wybierz warstwy"
@@ -256,14 +269,15 @@
       "placeholder": "Zapisz tutaj swój własny profil.",
       "profile": "Profil"
     },
-    "tab-tooltip": "{{action}}\n({{toggleKey}} key to toggle, {{switchKey}} to switch to next tab)"
+    "tab-tooltip": "{{action}}\n(klawisz {{toggleKey}} aby przełączyć, klawisz {{switchKey}} aby przejść do następnej karty)"
   },
   "title": "Klient przeglądarkowy BRouter",
   "trackasroute": {
+    "browse": "Przeglądaj",
     "explainpoi": "(pokaż punkty trasy jako POI)",
     "explaintracklayer": "(pokaż ślad jako osobną warstwę)",
     "file": "Plik śladu",
-    "fuzziness": "rozmycie",
+    "fuzziness": "Dopasowanie",
     "pleasewait": "Proszę czekać!",
     "showpois": "Interesujące punkty",
     "title": "Wczytaj ślad jako trasę",
@@ -283,7 +297,7 @@
     "upload-error": "Błąd przesyłania: {{error}}"
   },
   "whatsnew": {
-    "new-version": "A new version was released since your last visit. Click <a href='.' data-toggle='modal' data-target='#whatsnew'>here</a> to see what's new!",
-    "title": "What's new?"
+    "new-version": "Od momentu twojej ostatniej wizyty pojawiłą się nowsza wersja. kliknij <a href='.' data-toggle='modal' data-target='#whatsnew'>tutaj</a> aby sprawdzić co nowego!",
+    "title": "Co nowego?"
   }
 }
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index d77ce73..995b28c 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -15,7 +15,7 @@
     "tooltip": "Mostrar mais informações sobre o BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Dados de elevação",
@@ -25,6 +25,7 @@
     "map-tiles": "Blocos de mapa",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Créditos"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Mean cost factor",
     "meter": "meters",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total Energy",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Add base layer",
     "add-overlay": "Add overlay",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Customize layers",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Remove selection"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Load",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Source",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap contributors",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Cost coding",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Show Strava biking segments",
     "strava-running": "Show Strava running segments",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Zoom out"
   },
   "modal": {
-    "close": "Close"
-  },
+    "close": "Close"},
   "navbar": {
     "about": "About",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europe",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "More",
       "overlay-opacity": "Overlay transparency",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No custom layer configured yet.",
         "name": "Name",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Layers",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/pt.json b/locales/pt.json
index f10890c..fb28dc3 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Dados de elevação",
@@ -25,6 +25,7 @@
     "map-tiles": "Map tiles",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Mean cost factor",
     "meter": "meters",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total Energy",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Add base layer",
     "add-overlay": "Add overlay",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Customize layers",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Remove selection"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Load",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Source",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap contributors",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Cost coding",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Show Strava biking segments",
     "strava-running": "Show Strava running segments",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Zoom out"
   },
   "modal": {
-    "close": "Close"
-  },
+    "close": "Close"},
   "navbar": {
     "about": "About",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europe",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "More",
       "overlay-opacity": "Overlay transparency",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No custom layer configured yet.",
         "name": "Name",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Layers",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/ru_RU.json b/locales/ru_RU.json
index bcd2605..1c2363a 100644
--- a/locales/ru_RU.json
+++ b/locales/ru_RU.json
@@ -5,17 +5,17 @@
     "bug-reports-front": "веб-клиент / интерфейс.",
     "chat": "Чат с пользователями и разработчиками",
     "contact": "Контактная информация:",
-    "contact-language": "Preferred language is English, as we have both international contributors and users.",
+    "contact-language": "Предпочтительный язык - английский, так как у нас есть как участники, так и пользователи из других стран.",
     "data": "Данные:",
     "data-description": "Основано на проекте <a href=\"https://www.openstreetmap.org\" target=\"_blank\">OpenStreetMap</a>. Обычно оно ежедневно обновляется, видит даты <a href=\"https://brouter.de/brouter/segments4/\" target=\"_blank\">загруженных файлов.",
     "description": "Online service of the BRouter routing engine. For the offline Android app and more information see <a href=\"https://brouter.de/\" target=\"_blank\">brouter.de</a>",
     "details": "<i><a href=\"{{privacyPolicyUrl}}\" target=\"_blank\">Политика конфиденциальности</a></i>\n<i><a href=\"https://github.com/nrenner/brouter-web#credits-and-licenses\" target=\"_blank\"></a></i>\n<i><a href=\"https://github.com/nrenner/brouter-web/blob/master/CHANGELOG.md\" target=\"_blank\">Журнал изменений</a></i>и\n<i><a href=\"https://github.com/nrenner/brouter-web#readme\" target=\"_blank\">подробнее</a></i> о клиенте.",
     "support": "Общие дискуссии/ вопросы, поддержка",
     "title": "О сервисе",
-    "tooltip": "Show more information about BRouter-Web"
+    "tooltip": "Показать дополнительную информацию о BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Административные границы: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Elevation data",
@@ -25,6 +25,7 @@
     "map-tiles": "Картографические фрагменты",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Средний коэффициент стоимости",
     "meter": "метры",
     "meter-abbrev": "м",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Общая энергия",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Добавить базовый слой",
     "add-overlay": "Добавить наложение",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Настроить слои",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Имя пользовательского слоя. (наприм. OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Убрать выделение"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "Файл (.geojson)",
     "load": "Загрузить",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Источник",
     "title": "Загрузить запретные зоны",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "Участники OpenStreetMap",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Кодирование стоимости",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Show Strava biking segments",
     "strava-running": "Show Strava running segments",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Уменьшить"
   },
   "modal": {
-    "close": "Закрыть"
-  },
+    "close": "Закрыть"},
   "navbar": {
     "about": "About",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Загрузить",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Европа",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Наложение",
+        "overpass": "Locations (POIs)",
         "worldwide": "Всемирный",
         "worldwide-international": "Многоязычный во всём мире",
         "worldwide-monolingual": "Одноязычный во всём мире"
@@ -238,14 +247,18 @@
       "optional": "Добавить или удалить дополнительные слои",
       "optional-layers": "Ещё",
       "overlay-opacity": "Перекрытие прозрачностью",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL-адрес",
+        "URL": "URL/Query",
         "empty": "Произвольный слой ещё не настроен.",
         "name": "Название",
-        "type": "Тип"
+        "type": "Тип",
+        "type_layer": "Слой",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Слои",
-      "tooltip": "Select layers"
+      "tooltip": "Выбрать слои"
     },
     "profile": {
       "apply": "Применить",
@@ -260,11 +273,12 @@
   },
   "title": "Веб-клиент BRouter",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
-    "pleasewait": "Please wait!",
+    "fuzziness": "Fuzziness",
+    "pleasewait": "Пожалуйста подождите!",
     "showpois": "POI's",
     "title": "Load Track as Route",
     "tracklayer": "Track Layer",
@@ -284,6 +298,6 @@
   },
   "whatsnew": {
     "new-version": "A new version was released since your last visit. Click <a href='.' data-toggle='modal' data-target='#whatsnew'>here</a> to see what's new!",
-    "title": "What's new?"
+    "title": "Что нового?"
   }
 }
diff --git a/locales/tr.json b/locales/tr.json
index 9fe1fa7..9626232 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -15,7 +15,7 @@
     "tooltip": "Show more information about BRouter-Web"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Elevation data",
@@ -25,6 +25,7 @@
     "map-tiles": "Harita döşemeleri",
     "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Mean cost factor",
     "meter": "metreler",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total Energy",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "Add base layer",
     "add-overlay": "Add overlay",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "Katmanları özelleştir",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
-    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "Remove selection"
   },
   "loadNogos": {
     "defaultProperties": "Varsayılan özellikler",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Yükle",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Kaynak",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap contributors",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Cost coding",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "Show Strava biking segments",
     "strava-running": "Show Strava running segments",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "Zoom out"
   },
   "modal": {
-    "close": "Close"
-  },
+    "close": "Close"},
   "navbar": {
     "about": "About",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europe",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "More",
       "overlay-opacity": "Overlay transparency",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "No custom layer configured yet.",
         "name": "Name",
-        "type": "Type"
+        "type": "Type",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "Layers",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter web client",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index c2069a9..60783ec 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -12,33 +12,34 @@
     "details": "用戸端上的<i><a href=\"{{privacyPolicyUrl}}\" target=\"_blank\">隱私政策</a></i>、\n<i><a href=\"https://github.com/nrenner/brouter-web#credits-and-licenses\" target=\"_blank\">開發人員名單</a></i>、\n<i><a href=\"https://github.com/nrenner/brouter-web/blob/master/CHANGELOG.md\" target=\"_blank\">更新日誌</a></i> 及\n<i><a href=\"https://github.com/nrenner/brouter-web#readme\" target=\"_blank\">更多資訊</a></i> ",
     "support": "一般討論/提問及技術支援",
     "title": "關於",
-    "tooltip": "Show more information about BRouter-Web"
+    "tooltip": "顯示關於 BRouter-Web 更多的資訊"
   },
   "credits": {
-    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" target=\"_blank\">Overpass API</a>",
+    "boundaries": "Administrative Boundaries: <a href=\"https://osm-boundaries.com\" target=\"_blank\">OSM-Boundaries</a>, <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "brouter": "BRouter",
     "brouter-license": "<a target=\"_blank\" href=\"https://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
     "elevation-data": "Elevation data",
     "esri-license": "<a target=\"_blank\" href=\"http://goto.arcgisonline.com/maps/World_Imagery\">World Imagery</a> &copy; <a target=\"_blank\" href=\"https://www.esri.com/\">Esri</a>, 來源: Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, 以及 GIS 使用者社群",
     "esri-tiles": "Esri World Imagery",
     "map-data": "地圖資料",
-    "map-tiles": "Map tiles",
+    "map-tiles": "圖磚",
     "nominatim": "搜尋服務由 <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>提供",
     "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap 貢獻者</a> 基於 <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>釋出",
+    "pois": "Locations (POIs): <a href=\"https://overpass-api.de/\" class=\"overpass-url\" target=\"_blank\">Overpass API</a>",
     "title": "Credits"
   },
   "export": {
-    "format": "Format",
+    "format": "格式",
     "format_csv": "CSV",
     "format_geojson": "GeoJSON",
     "format_gpx": "GPX",
     "format_kml": "KML",
     "include": "Include",
-    "include_waypoints": "Waypoints",
+    "include_waypoints": "航點",
     "route-from-to": "{{from}} -> {{to}} ({{distance}}km)",
     "route-loop": "{{from}} ({{distance}}km)",
-    "title": "Export route",
-    "trackname": "Name"
+    "title": "匯出路徑",
+    "trackname": "名稱"
   },
   "footer": {
     "ascend": "Ascend",
@@ -55,6 +56,7 @@
     "mean-cost-factor": "Mean cost factor",
     "meter": "meters",
     "meter-abbrev": "m",
+    "no-elevation-data": "No elevation data available for this route.",
     "plain-ascend": "Plain ascend",
     "stats-info": "Start drawing a route to get stats.",
     "total-energy": "Total Energy",
@@ -69,22 +71,27 @@
   "layers": {
     "add-base": "添加底層圖",
     "add-overlay": "添加疊圖",
+    "add-overpass": "Add overpass query",
+    "custom-layer-name-helptext": "ex: OpenStreetMap",
+    "custom-layer-name-label": "Custom layer name",
+    "custom-layer-url-helptext-normal": "URL for normal layers, ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
+    "custom-layer-url-helptext-overpass": "Overpass Query, ex: nwr[shop]['diet:vegan']['diet:vegan'!=no];",
+    "custom-layer-url-label": "Custom layer URL/Query",
     "customize": "自定義圖層",
     "opacity-slider": "Opacity slider",
-    "placeholder-layer-name": "自定義圖層名稱 (如: OpenStreetMap)",
-    "placeholder-layer-url": "自定義圖層 URL (如: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "overpass-loading-indicator": "Running Overpass API query ...",
     "remove-selection": "移除所選項目"
   },
   "loadNogos": {
     "defaultProperties": "Default properties",
-    "file": "File (.geojson): ",
+    "file": "File (.geojson)",
     "load": "Load",
-    "nogoBuffer": "Buffer no-go areas (in meters): ",
-    "nogoRadius": "No-go radius for points (in meters): ",
-    "nogoWeight": "No-go weight (-1 means impassable): ",
+    "nogoBuffer": "Buffer no-go areas (in meters)",
+    "nogoRadius": "No-go radius for points (in meters)",
+    "nogoWeight": "No-go weight (-1 means impassable)",
     "source": "Source",
     "title": "Load no-go areas",
-    "url": "URL: "
+    "url": "URL"
   },
   "map": {
     "attribution-osm-long": "OpenStreetMap 貢獻者",
@@ -142,6 +149,8 @@
     "route-quality-cost": "Cost coding",
     "route-quality-incline": "Incline coding",
     "route-quality-shortcut": "{{action}} ({{key}} key to toggle)",
+    "route-tooltip-segment": "Drag to create a new waypoint",
+    "route-tooltip-waypoint": "Waypoint. Drag to move; Click to remove.",
     "strava-biking": "顯示 Strava 自行車區段",
     "strava-running": "顯示 Strava 跑步區段",
     "strava-shortcut": "{{action}}\n({{key}} key to toggle layer, click to reload for current area)",
@@ -149,8 +158,7 @@
     "zoomOutTitle": "縮小"
   },
   "modal": {
-    "close": "Close"
-  },
+    "close": "Close"},
   "navbar": {
     "about": "關於",
     "alternative": {
@@ -164,7 +172,7 @@
     "load": {
       "nogos": "Load no-go areas",
       "title": "Load",
-      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{nogosAction}} ({{nogosKey}})",
+      "tooltip": "{{tracksAction}} ({{tracksKey}} key)\n{{trackAsRouteAction}} ({{trackAsRouteKey}})\n{{nogosAction}} ({{nogosKey}})",
       "tracks": "Load tracks"
     },
     "profile": {
@@ -227,6 +235,7 @@
         "europe": "Europe",
         "europe-monolingual": "Europe monolingual",
         "overlays": "Overlays",
+        "overpass": "Locations (POIs)",
         "worldwide": "Worldwide",
         "worldwide-international": "Worldwide international",
         "worldwide-monolingual": "Worldwide monolingual"
@@ -238,11 +247,15 @@
       "optional": "Add or remove optional layers",
       "optional-layers": "More",
       "overlay-opacity": "Overlay transparency",
+      "overlay-opacity_plural": "Overlays transparency",
       "table": {
-        "URL": "URL",
+        "URL": "URL/Query",
         "empty": "尚未設定自訂圖層。",
         "name": "名稱",
-        "type": "類型"
+        "type": "類型",
+        "type_layer": "Layer",
+        "type_overlay": "Overlay",
+        "type_overpass_query": "Overpass Query"
       },
       "title": "圖層",
       "tooltip": "Select layers"
@@ -260,10 +273,11 @@
   },
   "title": "BRouter 網頁用戶端",
   "trackasroute": {
+    "browse": "Browse",
     "explainpoi": "(show waypoints as POI's)",
     "explaintracklayer": "(show Track as separate Layer)",
     "file": "Trackfile",
-    "fuzziness": "fuzziness",
+    "fuzziness": "Fuzziness",
     "pleasewait": "Please wait!",
     "showpois": "POI's",
     "title": "Load Track as Route",
diff --git a/package.json b/package.json
index 339ead6..d36326e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "brouter-web",
-    "version": "0.15.1",
+    "version": "0.16.0",
     "description": "Web client for BRouter",
     "main": "js/index.js",
     "scripts": {
@@ -36,14 +36,17 @@
     ],
     "dependencies": {
         "@bagage/leaflet.restoreview": "1.0.1",
+        "@fortawesome/fontawesome-free": "^5.15.3",
+        "@ideditor/temaki": "^5.0.0",
+        "@mapbox/maki": "^6.2.0",
         "@mapbox/polyline": "^0.2.0",
         "@mapbox/togeojson": "^0.16.0",
         "@turf/turf": "^6.2.0",
         "Leaflet.vector-markers": "nrenner/Leaflet.vector-markers#2ef80c9",
         "async": "~0.9.2",
-        "bootbox": "~5.3.4",
+        "bootbox": "~5.5.2",
         "bootstrap": "4.3.1",
-        "bootstrap-select": "1.13.6",
+        "bootstrap-select": "1.13.18",
         "bootstrap-slider": "^9.8.1",
         "codemirror": "^5.35.0",
         "core-js-bundle": "^3.8.3",
@@ -57,7 +60,7 @@
         "jquery-i18next": "^1.2.1",
         "jstree": "^3.3.8",
         "leaflet": "~1.6.0",
-        "leaflet-control-geocoder": "^1.13.0",
+        "leaflet-control-geocoder": "^2.2.0",
         "leaflet-easybutton": "*",
         "leaflet-editable": "^1.1.0",
         "leaflet-filelayer": "^1.2.0",
@@ -74,6 +77,7 @@
         "leaflet.stravasegments": "2.3.2",
         "mapbbcode": "MapBBCode/mapbbcode#v1.2.0",
         "osmtogeojson": "^3.0.0-beta.4",
+        "overpass-layer": "^3.0.0",
         "regenerator-runtime": "^0.13.7",
         "togpx": "nrenner/togpx#722d291",
         "tokml": "^0.4.0",
@@ -284,6 +288,80 @@
             "main": [
                 "tokml.js"
             ]
+        },
+        "overpass-layer": {
+            "main": [
+                "dist/overpass-layer.js"
+            ]
+        },
+        "@mapbox/maki": {
+            "main": [
+                "icons/art-gallery-11.svg",
+                "icons/bakery-11.svg",
+                "icons/bank-11.svg",
+                "icons/bar-11.svg",
+                "icons/bbq-11.svg",
+                "icons/beer-11.svg",
+                "icons/bicycle-11.svg",
+                "icons/cafe-11.svg",
+                "icons/campsite-11.svg",
+                "icons/car-11.svg",
+                "icons/car-rental-11.svg",
+                "icons/drinking-water-11.svg",
+                "icons/entrance-alt1-11.svg",
+                "icons/fast-food-11.svg",
+                "icons/fuel-11.svg",
+                "icons/grocery-11.svg",
+                "icons/hospital-11.svg",
+                "icons/information-11.svg",
+                "icons/lodging-11.svg",
+                "icons/picnic-site-11.svg",
+                "icons/restaurant-11.svg",
+                "icons/shelter-11.svg",
+                "icons/shop-11.svg",
+                "icons/star-11.svg",
+                "icons/toilet-11.svg",
+                "icons/water-11.svg"
+            ]
+        },
+        "@ideditor/temaki": {
+            "main": [
+                "icons/bench.svg",
+                "icons/shower.svg",
+                "icons/bicycle_rental.svg",
+                "icons/bicycle_repair.svg",
+                "icons/boat_rental.svg",
+                "icons/bus.svg",
+                "icons/sign_and_car.svg",
+                "icons/car_wash.svg",
+                "icons/ferry.svg",
+                "icons/car_parked.svg",
+                "icons/parking_space.svg",
+                "icons/bottles.svg",
+                "icons/cleaver.svg",
+                "icons/coffee.svg",
+                "icons/camper_trailer.svg",
+                "icons/cabin.svg",
+                "icons/bunk_beds.svg",
+                "icons/museum.svg",
+                "icons/spotting_scope.svg",
+                "icons/cabin.svg"
+            ]
+        },
+        "@fortawesome/fontawesome-free": {
+            "main": [
+                "svgs/solid/shopping-basket.svg",
+                "svgs/solid/ice-cream.svg",
+                "svgs/solid/carrot.svg",
+                "svgs/solid/cheese.svg",
+                "svgs/solid/concierge-bell.svg",
+                "svgs/solid/motorcycle.svg",
+                "svgs/solid/charging-station.svg",
+                "svgs/solid/box.svg",
+                "svgs/solid/taxi.svg",
+                "svgs/solid/phone-alt.svg",
+                "svgs/solid/beer.svg"
+            ]
         }
     }
 }
diff --git a/yarn.lock b/yarn.lock
index fbc7b7d..8ec6618 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -918,6 +918,11 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@fortawesome/fontawesome-free@^5.15.3":
+  version "5.15.3"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz#c36ffa64a2a239bf948541a97b6ae8d729e09a9a"
+  integrity sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==
+
 "@gulp-sourcemaps/identity-map@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz#a6e8b1abec8f790ec6be2b8c500e6e68037c0019"
@@ -937,6 +942,11 @@
     normalize-path "^2.0.1"
     through2 "^2.0.3"
 
+"@ideditor/temaki@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@ideditor/temaki/-/temaki-5.0.0.tgz#8351b3c47de59e9b98396c2cca49bc3dc2049e0a"
+  integrity sha512-doBSdSEr03uGx+hpe14ELxUkCoJexjwZ4/bPyMaBJjMHXlb8lKtCr7oG7YZTZsuzcFZCYGxfCTQsgpoO42vZnQ==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1141,6 +1151,11 @@
     minimist "1.2.0"
     sharkdown "^0.1.0"
 
+"@mapbox/maki@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@mapbox/maki/-/maki-6.2.0.tgz#b61b3e8e7fc7637493e511ac40de0eea62cd1f8b"
+  integrity sha512-iFIRNT3ZpTOw69p2BFFOmQppujpav2PQTLPyL4+bZ5ZIUfdyB5Qtw45CTfPqzzHpP2AZGjEDbSNhGDRcG9/2fw==
+
 "@mapbox/polyline@^0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@mapbox/polyline/-/polyline-0.2.0.tgz#6e25980744aa22331f94b645a542c02d3fcfee97"
@@ -1198,6 +1213,17 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@turf/along@^6.0.1":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/along/-/along-6.3.0.tgz#9a1d2d418027945f113e15029f53069b335bf426"
+  integrity sha512-2j0nHp38IuzESyv5/9hLYM2MuUe155Kw390lkQtiLjhRtTeYQNEaRy+uhZhf3/DWrjGULH1HatLc5j0CmiwrJA==
+  dependencies:
+    "@turf/bearing" "^6.3.0"
+    "@turf/destination" "^6.3.0"
+    "@turf/distance" "^6.3.0"
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+
 "@turf/along@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/along/-/along-6.2.0.tgz#509438f1b83cd01b7edbb3b9830b46137e554ca0"
@@ -1227,6 +1253,14 @@
     "@turf/helpers" "^6.2.0"
     "@turf/meta" "^6.2.0"
 
+"@turf/bbox-clip@^6.0.3":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/bbox-clip/-/bbox-clip-6.3.0.tgz#43bed0d963d06e254135c27e4bc13ed55ad89cf9"
+  integrity sha512-DCFs1MdX3P7SzZiBjT1kWBp4g0cfv8Yn2/Ccq3JP4iVaqNQJujPfe0WwZjjTdXLbLLFTjoxnCJBjy3WZDmLvlw==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+
 "@turf/bbox-clip@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/bbox-clip/-/bbox-clip-6.2.0.tgz#0bb64bd1a0fe5852c098c1346919dcb790d011ad"
@@ -1250,6 +1284,14 @@
     "@turf/helpers" "^6.2.0"
     "@turf/meta" "^6.2.0"
 
+"@turf/bbox@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-5.1.5.tgz#3051df514ad4c50f4a4f9b8a2d15fd8b6840eda3"
+  integrity sha1-MFHfUUrUxQ9KT5uKLRX9i2hA7aM=
+  dependencies:
+    "@turf/helpers" "^5.1.5"
+    "@turf/meta" "^5.1.5"
+
 "@turf/bearing@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/bearing/-/bearing-6.2.0.tgz#bdd02f5502f2e8cb4207be872494941b72b277b8"
@@ -1258,6 +1300,14 @@
     "@turf/helpers" "^6.2.0"
     "@turf/invariant" "^6.2.0"
 
+"@turf/bearing@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/bearing/-/bearing-6.3.0.tgz#4de3f398382772031e84491734902b8d37bc8c84"
+  integrity sha512-apuUm9xN6VQLO33m7F2mmzlm3dHfeesJjMSzh9iehGtgmp1IaVndjdcIvs0ieiwm8bN9UhwXpfPtO3pV0n9SFw==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+
 "@turf/bezier-spline@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/bezier-spline/-/bezier-spline-6.2.0.tgz#25f943546b1d780c6f63f28e20f47fbea5197423"
@@ -1348,6 +1398,22 @@
     "@turf/line-segment" "^6.2.0"
     "@turf/rhumb-bearing" "^6.2.0"
 
+"@turf/boolean-point-in-polygon@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-5.1.5.tgz#f01cc194d1e030a548bfda981cba43cfd62941b7"
+  integrity sha1-8BzBlNHgMKVIv9qYHLpDz9YpQbc=
+  dependencies:
+    "@turf/helpers" "^5.1.5"
+    "@turf/invariant" "^5.1.5"
+
+"@turf/boolean-point-in-polygon@^6.0.1":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.3.0.tgz#784952a36c64119e90fbe94650245da62ecd8fc2"
+  integrity sha512-NqFSsoE6OwhDK19IllDQRhEQEkF7UVEOlqH9vgS1fGg4T6NcyKvACJs05c9457tL7QSbV9ZS53f2qiLneFL+qg==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+
 "@turf/boolean-point-in-polygon@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.2.0.tgz#b9f4984535a4d0cb98959ff6e402b82df14f3015"
@@ -1419,6 +1485,14 @@
     "@turf/invariant" "^6.2.0"
     "@turf/meta" "^6.2.0"
 
+"@turf/center@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/center/-/center-5.1.5.tgz#44ab2cd954f63c0d37757f7158a99c3ef5114b80"
+  integrity sha1-RKss2VT2PA03dX9xWKmcPvURS4A=
+  dependencies:
+    "@turf/bbox" "^5.1.5"
+    "@turf/helpers" "^5.1.5"
+
 "@turf/center@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/center/-/center-6.2.0.tgz#ace81665eeb019b676b0fdf5e7d95a734b946e11"
@@ -1451,6 +1525,13 @@
     "@turf/helpers" "^6.2.0"
     "@turf/invariant" "^6.2.0"
 
+"@turf/clone@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-5.1.5.tgz#253e8d35477181976e33adfab50a0f02a7f0e367"
+  integrity sha1-JT6NNUdxgZduM636tQoPAqfw42c=
+  dependencies:
+    "@turf/helpers" "^5.1.5"
+
 "@turf/clone@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-6.2.0.tgz#35b0295759b6e134fb9f60752de2a5626bd97c9f"
@@ -1536,6 +1617,23 @@
     "@turf/helpers" "^6.2.0"
     "@turf/invariant" "^6.2.0"
 
+"@turf/destination@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/destination/-/destination-6.3.0.tgz#7032eeb0ec5d1a035d98faaddac039eea96abb04"
+  integrity sha512-aLt3U/XkJWyZW08Ln1qZwBNAGh27yhmYLu892+dBj3gKP6UUiR6ZopXxrBwjBVe00A6k2ktftKDn79qe0hptuw==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+
+"@turf/difference@^6.0.2":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/difference/-/difference-6.3.0.tgz#dee2bb10fb80896ba3a7c8fe30be3e9f9d604c1e"
+  integrity sha512-f4P0ra0jBOFk4HO8n/9FZ3NEmOX7FHCXHy/4Z1RSUUQsUQDCkx6/cyqbi8BCy2ZSDUSCGHV+iPgs4fRphMzCHQ==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+    polygon-clipping "^0.15.2"
+
 "@turf/difference@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/difference/-/difference-6.2.0.tgz#dea4c4b7f478ee907befa2ce089e64734e7c3304"
@@ -1570,6 +1668,14 @@
     "@turf/invariant" "^6.2.0"
     "@turf/meta" "^6.2.0"
 
+"@turf/distance@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-5.1.5.tgz#39cf18204bbf87587d707e609a60118909156409"
+  integrity sha1-Oc8YIEu/h1h9cH5gmmARiQkVZAk=
+  dependencies:
+    "@turf/helpers" "^5.1.5"
+    "@turf/invariant" "^5.1.5"
+
 "@turf/distance@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-6.2.0.tgz#a665b34944c17f349bc6ee6932c83daa3757067b"
@@ -1578,6 +1684,14 @@
     "@turf/helpers" "^6.2.0"
     "@turf/invariant" "^6.2.0"
 
+"@turf/distance@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-6.3.0.tgz#4bd084af7fe369e921476e52b597a638dae4ed95"
+  integrity sha512-basi24ssNFnH3iXPFjp/aNUrukjObiFWoIyDRqKyBJxVwVOwAWvfk4d38QQyBj5nDo5IahYRq/Q+T47/5hSs9w==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+
 "@turf/ellipse@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/ellipse/-/ellipse-6.2.0.tgz#3965f6eb01efaddbcf6d1277cc7a091993b69881"
@@ -1597,6 +1711,14 @@
     "@turf/bbox-polygon" "^6.2.0"
     "@turf/helpers" "^6.2.0"
 
+"@turf/explode@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/explode/-/explode-5.1.5.tgz#b12b2f774004a1b48f62ba95b20a1c655a3de118"
+  integrity sha1-sSsvd0AEobSPYrqVsgocZVo94Rg=
+  dependencies:
+    "@turf/helpers" "^5.1.5"
+    "@turf/meta" "^5.1.5"
+
 "@turf/explode@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/explode/-/explode-6.2.0.tgz#065d2325e0506df83feee3fd56e98d16c31f8da9"
@@ -1635,6 +1757,16 @@
   resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-6.2.0.tgz#dc770ce3b35b230f6a661824f3f87591378e379b"
   integrity sha512-ANcZ0LFpnrza52y3um8KXgbpF1l7qmJXEqY1Bv5RovdQH+kUvMrZsb4SO3q4VH4eQqlsxDLxxXl7hkjjFbDtHg==
 
+"@turf/helpers@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-5.1.5.tgz#153405227ab933d004a5bb9641a9ed999fcbe0cf"
+  integrity sha1-FTQFInq5M9AEpbuWQantmZ/L4M8=
+
+"@turf/helpers@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-6.3.0.tgz#87f90f806c3f8ad6385ef8d2041d3662bf3c9fb1"
+  integrity sha512-kr6KuD4Z0GZ30tblTEvi90rvvVNlKieXuMC8CTzE/rVQb0/f/Cb29zCXxTD7giQTEQY/P2nRW23wEqqyNHulCg==
+
 "@turf/hex-grid@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/hex-grid/-/hex-grid-6.2.0.tgz#c7fceaddc8a4bd86902d4ffa8d0c646920a55b77"
@@ -1662,6 +1794,15 @@
     "@turf/square-grid" "^6.2.0"
     "@turf/triangle-grid" "^6.2.0"
 
+"@turf/intersect@^6.1.3":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/intersect/-/intersect-6.3.0.tgz#b22b3e888e762ae4336e085eb6f21215d06652ea"
+  integrity sha512-1YCIkyKjuTlX7HaTjtyE7ZRxLCmcu0BYr6jqoVl7TjyF2NUiNpPm3m4X1ZrSF6MfjIt5NFSGYCdNMEPgREq19w==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+    polygon-clipping "^0.15.2"
+
 "@turf/intersect@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/intersect/-/intersect-6.2.0.tgz#739169f2719bf6cd2206e527eee2a04532748d61"
@@ -1671,6 +1812,13 @@
     "@turf/invariant" "^6.2.0"
     polygon-clipping "^0.15.2"
 
+"@turf/invariant@^5.1.5":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-5.2.0.tgz#f0150ff7290b38577b73d088b7932c1ee0aa90a7"
+  integrity sha1-8BUP9ykLOFd7c9CIt5MsHuCqkKc=
+  dependencies:
+    "@turf/helpers" "^5.1.5"
+
 "@turf/invariant@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-6.2.0.tgz#91c732b7c53e95afdbea944be3316bb8afd6a118"
@@ -1678,6 +1826,13 @@
   dependencies:
     "@turf/helpers" "^6.2.0"
 
+"@turf/invariant@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-6.3.0.tgz#04a22b26c5503146c03fa6198176b72bd591eadf"
+  integrity sha512-2OFOi9p+QOrcIMySEnr+WlOiKaFZ1bY56jA98YyECewJHfhPFWUBZEhc4nWGRT0ahK08Vus9+gcuBX8QIpCIIw==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+
 "@turf/isobands@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/isobands/-/isobands-6.2.0.tgz#7fd9f938ea5980b799c2b4ca68efbcd30057b0ec"
@@ -1710,6 +1865,15 @@
   dependencies:
     "@turf/helpers" "^6.2.0"
 
+"@turf/length@^6.0.2":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/length/-/length-6.3.0.tgz#7d6b61bf870d6f056eb34ec7a787ce49f7dbe292"
+  integrity sha512-91MHtigpV7mbrMW3xyaPVtLWQU3p487t3YHU4vdxih03p+dFI512dX/FtWbd9LNgrtBt4PM1uo1WmafGvfStKA==
+  dependencies:
+    "@turf/distance" "^6.3.0"
+    "@turf/helpers" "^6.3.0"
+    "@turf/meta" "^6.3.0"
+
 "@turf/length@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/length/-/length-6.2.0.tgz#1be7d381ca5967d6f389ae61f72fcb20945e9958"
@@ -1749,6 +1913,17 @@
     "@turf/meta" "^6.2.0"
     geojson-rbush "3.x"
 
+"@turf/line-intersect@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/line-intersect/-/line-intersect-6.3.0.tgz#726a50edc66bb7b5e798b052b103fb0da4d1c4f4"
+  integrity sha512-3naxR7XpkPd2vst3Mw6DFry4C9m3o0/f2n/xu5UAyxb88Ie4m2k+1eqkhzMMx/0L+E6iThWpLx7DASM6q6o9ow==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+    "@turf/line-segment" "^6.3.0"
+    "@turf/meta" "^6.3.0"
+    geojson-rbush "3.x"
+
 "@turf/line-offset@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/line-offset/-/line-offset-6.2.0.tgz#ec3ee6ff39bcc73a5e0e1956f1d5b0b3ffe81b16"
@@ -1781,6 +1956,15 @@
     "@turf/invariant" "^6.2.0"
     "@turf/meta" "^6.2.0"
 
+"@turf/line-segment@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/line-segment/-/line-segment-6.3.0.tgz#b37d6877ee4425ebc12698860e7d355d1bf2ba9b"
+  integrity sha512-M+aDy83V+E7jYWNaf+b+A88yhnMrJhyg/lhAj6mU6UeB2PbruXB2qgSmmVDSE2dIknOvZZuIWNzEzUI07RO2kw==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+    "@turf/meta" "^6.3.0"
+
 "@turf/line-slice-along@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/line-slice-along/-/line-slice-along-6.2.0.tgz#f97a24d5462859c3bcf091d8d0f8d454807ec2b9"
@@ -1844,6 +2028,20 @@
   dependencies:
     "@turf/helpers" "^6.2.0"
 
+"@turf/meta@^5.1.5":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-5.2.0.tgz#3b1ad485ee0c3b0b1775132a32c384d53e4ba53d"
+  integrity sha1-OxrUhe4MOwsXdRMqMsOE1T5LpT0=
+  dependencies:
+    "@turf/helpers" "^5.1.5"
+
+"@turf/meta@^6.3.0":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-6.3.0.tgz#f3e280ab29641f21e4f99310ce77f9c8394ae394"
+  integrity sha512-qBJjaAJS9H3ap0HlGXyF/Bzfl0qkA9suafX/jnDsZvWMfVLt+s+o6twKrXOGk5t7nnNON2NFRC8+czxpu104EQ==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+
 "@turf/midpoint@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/midpoint/-/midpoint-6.2.0.tgz#1fdc6289d99f286ce667992b12b684d15a3d86b5"
@@ -1863,6 +2061,19 @@
     "@turf/helpers" "^6.2.0"
     "@turf/meta" "^6.2.0"
 
+"@turf/nearest-point-on-line@^6.0.2":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/nearest-point-on-line/-/nearest-point-on-line-6.3.0.tgz#a33f14fb099c292777de136f8c96ef4a7cad8ae2"
+  integrity sha512-b4C9Md1VbGn9chMgdSj2grJD4w4t0owEWOKEBwOZfdhrcksyOedVvKB7XqOFdj/8Jitel40EKAC5LQTNu24kEQ==
+  dependencies:
+    "@turf/bearing" "^6.3.0"
+    "@turf/destination" "^6.3.0"
+    "@turf/distance" "^6.3.0"
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+    "@turf/line-intersect" "^6.3.0"
+    "@turf/meta" "^6.3.0"
+
 "@turf/nearest-point-on-line@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/nearest-point-on-line/-/nearest-point-on-line-6.2.0.tgz#1f8c83e49c6eb9fbd493b363f0bcb1623171ac18"
@@ -1887,6 +2098,16 @@
     "@turf/point-to-line-distance" "^6.2.0"
     object-assign "*"
 
+"@turf/nearest-point@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/nearest-point/-/nearest-point-5.1.5.tgz#12050de41c398443224c7978de0f6213900d34fb"
+  integrity sha1-EgUN5Bw5hEMiTHl43g9iE5ANNPs=
+  dependencies:
+    "@turf/clone" "^5.1.5"
+    "@turf/distance" "^5.1.5"
+    "@turf/helpers" "^5.1.5"
+    "@turf/meta" "^5.1.5"
+
 "@turf/nearest-point@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/nearest-point/-/nearest-point-6.2.0.tgz#f6c3e0adcf3298e4a04bbad5b6d79905850d61b2"
@@ -1915,6 +2136,17 @@
     "@turf/helpers" "^6.2.0"
     "@turf/invariant" "^6.2.0"
 
+"@turf/point-on-feature@^5.1.5":
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/@turf/point-on-feature/-/point-on-feature-5.1.5.tgz#30c7f032430277c6418d96d289e45b6bfb213fe7"
+  integrity sha1-MMfwMkMCd8ZBjZbSieRba/shP+c=
+  dependencies:
+    "@turf/boolean-point-in-polygon" "^5.1.5"
+    "@turf/center" "^5.1.5"
+    "@turf/explode" "^5.1.5"
+    "@turf/helpers" "^5.1.5"
+    "@turf/nearest-point" "^5.1.5"
+
 "@turf/point-on-feature@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/point-on-feature/-/point-on-feature-6.2.0.tgz#3445323440cf3d39c3f10582f061315852acab7f"
@@ -2312,6 +2544,15 @@
     "@turf/unkink-polygon" "^6.2.0"
     "@turf/voronoi" "^6.2.0"
 
+"@turf/union@^6.0.3":
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/@turf/union/-/union-6.3.0.tgz#12ff74d144c30f90bc8f5b8a34fe7d78acc6563a"
+  integrity sha512-m8yh13Q5E0Y+YC10+iI/Qq0Txt7UmSIFByc7DfNVlMMGTceqLFa8xGwSVdFuB/d6MWwKuzKonQMl1PUx/Vd2Iw==
+  dependencies:
+    "@turf/helpers" "^6.3.0"
+    "@turf/invariant" "^6.3.0"
+    polygon-clipping "^0.15.2"
+
 "@turf/union@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@turf/union/-/union-6.2.0.tgz#60116705d6a135be61b004010341f0b9e3c43182"
@@ -2486,6 +2727,15 @@ accepts@~1.3.4:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
+accessory@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/accessory/-/accessory-1.1.0.tgz#7833e9839a32ded76d26021f36a41707a520f593"
+  integrity sha1-eDPpg5oy3tdtJgIfNqQXB6Ug9ZM=
+  dependencies:
+    ap "~0.2.0"
+    balanced-match "~0.2.0"
+    dot-parts "~1.0.0"
+
 acorn-class-fields@^0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/acorn-class-fields/-/acorn-class-fields-0.3.7.tgz#a35122f3cc6ad2bb33b1857e79215677fcfdd720"
@@ -2549,6 +2799,11 @@ acorn-walk@^8.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz#56ae4c0f434a45fff4a125e7ea95fa9c98f67a16"
   integrity sha512-oZRad/3SMOI/pxbbmqyurIx7jHw1wZDcR9G44L8pUVFEomX/0dH89SrM1KaDXuv1NpzAXz6Op/Xu/Qd5XXzdEA==
 
+acorn@^5.2.1:
+  version "5.7.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
+  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+
 acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
@@ -2599,6 +2854,11 @@ ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
 ansi-colors@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
@@ -2724,6 +2984,11 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+ap@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ap/-/ap-0.2.0.tgz#ae0942600b29912f0d2b14ec60c45e8f330b6110"
+  integrity sha1-rglCYAspkS8NKxTsYMRejzMLYRA=
+
 append-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
@@ -2948,6 +3213,11 @@ async@^0.9.0, async@~0.9.2:
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
   integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
 
+async@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -3092,6 +3362,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+balanced-match@~0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
+  integrity sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=
+
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
@@ -3169,30 +3444,35 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-bootbox@~5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/bootbox/-/bootbox-5.3.4.tgz#03064346c79c019708500dab679341645bb10952"
-  integrity sha512-odUj3HCaIfaSltAyfCRuPavruQKvpluTihyCbJ1bvRdAi7P2/bEbcjWMkTSonaHC+QjnrQfO1Px6863fJ13//A==
+bootbox@~5.5.2:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/bootbox/-/bootbox-5.5.2.tgz#a4200aa03f12ffe4d07905834e9dfb76e52cee00"
+  integrity sha512-q8d9VO2A4+q6S0XvovLtqtBUp7uRy0wtDOuuycnoheK2TiAm3um0jOlAOu9ORn9XoT92tdil+p15Dle1mRgSPQ==
   dependencies:
-    bootstrap ">=3.0.0"
-    jquery ">=1.12.0"
-    popper.js ">=1.12.9"
+    bootstrap "^4.4.0"
+    jquery "^3.5.1"
+    popper.js "^1.16.0"
 
-bootstrap-select@1.13.6:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.6.tgz#dc41f8a7385ab4e385562b400d4cf2422f5ef852"
-  integrity sha512-MsOZjYVv0jjHOCUV6CG3J8MSsosrKL8MlA8DacMhMqFq43tTxMjjd7Czo5a/upKPNHW6asFq29oyKJTrPva6FQ==
+bootstrap-select@1.13.18:
+  version "1.13.18"
+  resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.13.18.tgz#4557119d58dc1159189977161c803962220e4dda"
+  integrity sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow==
 
 bootstrap-slider@^9.8.1:
   version "9.10.0"
   resolved "https://registry.yarnpkg.com/bootstrap-slider/-/bootstrap-slider-9.10.0.tgz#1103d6bc00cfbfa8cfc9a2599ab518c55643da3f"
   integrity sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8=
 
-bootstrap@4.3.1, bootstrap@>=3.0.0:
+bootstrap@4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
   integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
 
+bootstrap@^4.4.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
+  integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
+
 bops@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/bops/-/bops-0.0.6.tgz#082d1d55fa01e60dbdc2ebc2dba37f659554cf3a"
@@ -3201,6 +3481,14 @@ bops@0.0.6:
     base64-js "0.0.2"
     to-utf8 "0.0.1"
 
+boundingbox@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/boundingbox/-/boundingbox-1.2.3.tgz#54ae1afb830285e4700472154cb4d64fd560d95c"
+  integrity sha512-QeTwAfHloUTYemaQ/B6/lHo7cpkZwMdTpYFFsxXD8NC3pPtjcL3nZiQ0JD4CS2DK99Oo5CyUlFfo3GvL6FoI7A==
+  dependencies:
+    geojson-bounds "^1.0.2"
+    haversine "^1.1.1"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -3295,6 +3583,31 @@ browser-sync@^2.26.14:
     ua-parser-js "^0.7.18"
     yargs "^15.4.1"
 
+browserify-css@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/browserify-css/-/browserify-css-0.15.0.tgz#ac9584c84b231e3a1718dd2d7718f0fcf1510b76"
+  integrity sha512-ZgLHyZ16PH6P25JlBE+5xNtdobpkc5Egh+ctc8ha3GDtuZqSSQu0ovOxOQvXt0xAmaXixth/DY9iT56HlDOxyg==
+  dependencies:
+    clean-css "^4.1.5"
+    concat-stream "^1.6.0"
+    css "^2.2.1"
+    find-node-modules "^2.0.0"
+    lodash "^4.17.11"
+    mime "^1.3.6"
+    strip-css-comments "^3.0.0"
+    through2 "2.0.x"
+
+browserify-shim@^3.8.14:
+  version "3.8.14"
+  resolved "https://registry.yarnpkg.com/browserify-shim/-/browserify-shim-3.8.14.tgz#bf1057026932d3253c75ef7dd714f3b877edec6b"
+  integrity sha1-vxBXAmky0yU8de991xTzuHft7Gs=
+  dependencies:
+    exposify "~0.5.0"
+    mothership "~0.2.0"
+    rename-function-calls "~0.1.0"
+    resolve "~0.6.1"
+    through "~2.3.4"
+
 browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
@@ -3386,6 +3699,11 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
+bzip2@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/bzip2/-/bzip2-0.1.1.tgz#b0d232bd0f0f750d2023306d40a886ee51b901f4"
+  integrity sha1-sNIyvQ8PdQ0gIzBtQKiG7lG5AfQ=
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -3617,7 +3935,7 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@4.2.3:
+clean-css@4.2.3, clean-css@^4.1.5:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
   integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
@@ -4001,7 +4319,7 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css@^2.0.0:
+css@^2.0.0, css@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
   integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
@@ -4249,6 +4567,11 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
+defined@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+
 del@^1.1.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/del/-/del-1.2.1.tgz#aed6e5bcd7cb7325df34f563125fa265b2c1a014"
@@ -4306,6 +4629,22 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
+detective@^4.5.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+  integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==
+  dependencies:
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
+detective@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-3.1.0.tgz#77782444ab752b88ca1be2e9d0a0395f1da25eed"
+  integrity sha1-d3gkRKt1K4jKG+Lp0KA5Xx2iXu0=
+  dependencies:
+    escodegen "~1.1.0"
+    esprima-fb "3001.1.0-dev-harmony-fb"
+
 dev-ip@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
@@ -4363,6 +4702,11 @@ domutils@1.3:
   dependencies:
     domelementtype "1"
 
+dot-parts@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dot-parts/-/dot-parts-1.0.1.tgz#884bd7bcfc3082ffad2fe5db53e494d8f3e0743f"
+  integrity sha1-iEvXvPwwgv+tL+XbU+SU2PPgdD8=
+
 duplexer2@0.0.2, duplexer2@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@@ -4619,6 +4963,11 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
+es6-promise@^4.2.5:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
 es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
@@ -4677,6 +5026,17 @@ escodegen@^1.14.1:
   optionalDependencies:
     source-map "~0.6.1"
 
+escodegen@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.1.0.tgz#c663923f6e20aad48d0c0fa49f31c6d4f49360cf"
+  integrity sha1-xmOSP24gqtSNDA+knzHG1PSTYM8=
+  dependencies:
+    esprima "~1.0.4"
+    estraverse "~1.5.0"
+    esutils "~1.0.0"
+  optionalDependencies:
+    source-map "~0.1.30"
+
 eslint-plugin-compat@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz#a7a224e09b102b58e7f7dff52c936428ff3e0186"
@@ -4773,6 +5133,11 @@ espree@^7.3.0, espree@^7.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
+esprima-fb@3001.1.0-dev-harmony-fb:
+  version "3001.1.0-dev-harmony-fb"
+  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz#b77d37abcd38ea0b77426bb8bc2922ce6b426411"
+  integrity sha1-t303q8046gt3Qmu4vCkizmtCZBE=
+
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -4807,11 +5172,21 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
+estraverse@~1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz#867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"
+  integrity sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+esutils@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz#8151d358e20c8acc7fb745e7472c0025fe496570"
+  integrity sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=
+
 etag@1.8.1, etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
@@ -4900,6 +5275,17 @@ expect@^26.6.2:
     jest-message-util "^26.6.2"
     jest-regex-util "^26.0.0"
 
+exposify@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/exposify/-/exposify-0.5.0.tgz#f92d0094c265b3f553e1fa456a03a1883d1059cc"
+  integrity sha1-+S0AlMJls/VT4fpFagOhiD0QWcw=
+  dependencies:
+    globo "~1.1.0"
+    map-obj "~1.0.1"
+    replace-requires "~1.0.3"
+    through2 "~0.4.0"
+    transformify "~0.1.1"
+
 ext@^1.1.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
@@ -5040,6 +5426,19 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+find-node-modules@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-2.1.2.tgz#57565a3455baf671b835bc6b2134a9b938b9c53c"
+  integrity sha512-x+3P4mbtRPlSiVE1Qco0Z4YLU8WFiFcuWTf3m75OV9Uzcfs2Bg+O9N+r/K0AnmINBW06KpfqKwYJbFlFq4qNug==
+  dependencies:
+    findup-sync "^4.0.0"
+    merge "^2.1.0"
+
+find-parent-dir@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -5083,6 +5482,16 @@ findup-sync@^3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+findup-sync@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
+  integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^4.0.2"
+    resolve-dir "^1.0.1"
+
 fined@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fined/-/fined-1.1.1.tgz#95d88ff329123dd1a6950fdfcd321f746271e01f"
@@ -5154,6 +5563,11 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
+foreachasync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
+  integrity sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -5272,6 +5686,11 @@ geo-data-exchange@alexcojocaru/geo-data-exchange#v1.1.0:
   dependencies:
     leaflet "^1.5.0"
 
+geojson-bounds@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/geojson-bounds/-/geojson-bounds-1.0.2.tgz#c4f6e64223b8c919436707fe1acfabe93145b986"
+  integrity sha512-VTVisOF00DPgIl5xodFx5xyt2XPMXsz2CIAAxFMAtXbrOJjz2gwgzkGQtLEQuuSztn4plIy3Cgravc3QTu9S/A==
+
 geojson-equality@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/geojson-equality/-/geojson-equality-0.1.6.tgz#a171374ef043e5d4797995840bae4648e0752d72"
@@ -5522,6 +5941,15 @@ globby@^2.0.0:
     glob "^5.0.3"
     object-assign "^3.0.0"
 
+globo@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/globo/-/globo-1.1.0.tgz#0d26098955dea422eb2001b104898b0a101caaf3"
+  integrity sha1-DSYJiVXepCLrIAGxBImLChAcqvM=
+  dependencies:
+    accessory "~1.1.0"
+    is-defined "~1.0.0"
+    ternary "~1.0.0"
+
 glogg@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
@@ -5922,6 +6350,13 @@ has-gulplog@^0.1.0:
   dependencies:
     sparkles "^1.0.0"
 
+has-require@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/has-require/-/has-require-1.2.2.tgz#921675ab130dbd9768fc8da8f1a8e242dfa41774"
+  integrity sha1-khZ1qxMNvZdo/I2o8ajiQt+kF3Q=
+  dependencies:
+    escape-string-regexp "^1.0.3"
+
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -5975,6 +6410,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+haversine@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/haversine/-/haversine-1.1.1.tgz#05b65e0445aca8f217b0db56877e4d637d3fc8ae"
+  integrity sha512-KW4MS8+krLIeiw8bF5z532CptG0ZyGGFj0UbKMxx25lKnnJ1hMUbuzQl+PXQjNiDLnl1bOyz23U6hSK10r4guw==
+
 homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
@@ -5994,6 +6434,11 @@ html-encoding-sniffer@^2.0.1:
   dependencies:
     whatwg-encoding "^1.0.5"
 
+html-escape@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-escape/-/html-escape-2.0.0.tgz#60c8ddd465edf0cae02af9e99fdf5f883b09be49"
+  integrity sha1-YMjd1GXt8MrgKvnpn99fiDsJvkk=
+
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
@@ -6369,6 +6814,11 @@ is-date-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
   integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
+is-defined@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-defined/-/is-defined-1.0.0.tgz#1f07ca67d571f594c4b14415a45f7bef88f92bf5"
+  integrity sha1-HwfKZ9Vx9ZTEsUQVpF9774j5K/U=
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -7082,11 +7532,16 @@ jquery@3.5.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
   integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
 
-jquery@>=1.12.0, jquery@>=1.7, jquery@>=1.9.1:
+jquery@>=1.7, jquery@>=1.9.1:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
   integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
+jquery@^3.5.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
 js-base64@^2.1.9:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
@@ -7305,10 +7760,10 @@ lead@^1.0.0:
   dependencies:
     flush-write-stream "^1.0.2"
 
-leaflet-control-geocoder@^1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/leaflet-control-geocoder/-/leaflet-control-geocoder-1.13.0.tgz#c84cffd8f64a8f0b1091a59c3b59c03d5dcc583e"
-  integrity sha512-mgYGx/2WA5CcvhP+IJtw7VvJwSGAe5zxX+TKe6ruYkLj2W5I5V/K/nQiLvsUtqifBojBGoKIPNZ8m0mXJNIudg==
+leaflet-control-geocoder@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/leaflet-control-geocoder/-/leaflet-control-geocoder-2.2.0.tgz#c2ebf1913acae683d995769f8652f61b0508122f"
+  integrity sha512-OSnKVIeSZQUXGsErunUBhLbXf2YPRBADaStKipkD3/yrtsZAhLiyFoNHmhjP1nAqD6KO63A98xGfVs4EroFvFA==
   optionalDependencies:
     open-location-code "^1.0.0"
 
@@ -7499,6 +7954,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locutus@^2.0.11:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/locutus/-/locutus-2.0.14.tgz#53d259ac7200b0621ed4e5604b6c49993415a455"
+  integrity sha512-0H1o1iHNEp3kJ5rW57bT/CAP5g6Qm0Zd817Wcx2+rOMTYyIJoc482Ja1v9dB6IUjwvWKcBNdYi7x2lRXtlJ3bA==
+  dependencies:
+    es6-promise "^4.2.5"
+
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
@@ -7648,11 +8110,21 @@ lodash@^4.17.10, lodash@^4.17.14:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.11, lodash@^4.17.20:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
 lodash@^4.17.19:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
+lokijs@^1.5.11:
+  version "1.5.11"
+  resolved "https://registry.yarnpkg.com/lokijs/-/lokijs-1.5.11.tgz#2b2ea82ec66050e4b112c6cfc588dac22d362b13"
+  integrity sha512-YYyuBPxMn/oS0tFznQDbIX5XL1ltMcwFqCboDr8voYE4VCDzR5vAsrvQDhlnua4lBeqMqHmLvUXRTmRUzUKH1Q==
+
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -7726,7 +8198,7 @@ map-cache@^0.2.0, map-cache@^0.2.2:
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-obj@^1.0.0, map-obj@^1.0.1:
+map-obj@^1.0.0, map-obj@^1.0.1, map-obj@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
@@ -7792,6 +8264,11 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
+merge@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
+  integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
+
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@@ -7848,7 +8325,7 @@ mime@1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.3.4:
+mime@^1.3.4, mime@^1.3.6:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -7866,7 +8343,7 @@ minimatch@0.3:
     lru-cache "2"
     sigmund "~1.0.0"
 
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.x, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7940,6 +8417,13 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   dependencies:
     minimist "^1.2.5"
 
+mothership@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/mothership/-/mothership-0.2.0.tgz#93d48a2fbc3e50e2a5fc8ed586f5bc44c65f9a99"
+  integrity sha1-k9SKL7w+UOKl/I7VhvW8RMZfmpk=
+  dependencies:
+    find-parent-dir "~0.3.0"
+
 mri@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6"
@@ -8015,6 +8499,14 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+nearest-point-on-geometry@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/nearest-point-on-geometry/-/nearest-point-on-geometry-1.0.1.tgz#5c850936fe3be712cd4069ddca208d2755f84f48"
+  integrity sha1-XIUJNv475xLNQGndyiCNJ1X4T0g=
+  dependencies:
+    "@turf/boolean-point-in-polygon" "^6.0.1"
+    "@turf/nearest-point-on-line" "^6.0.2"
+
 needle@^2.2.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
@@ -8454,6 +8946,43 @@ osmtogeojson@^3.0.0-beta.4:
   optionalDependencies:
     "@types/geojson" "^1.0.2"
 
+overpass-frontend@^2.4.13:
+  version "2.4.13"
+  resolved "https://registry.yarnpkg.com/overpass-frontend/-/overpass-frontend-2.4.13.tgz#aaef2d2825ec044f0966a700d218ddf786b544c2"
+  integrity sha512-88llwSFmfeYHDZJd8eHqygUEYMH4n3kps+z1TbIKU7g9b/VuQcqjgQuPkdzgDAFIGv71P/8GPPKIevnFWWFytg==
+  dependencies:
+    "@turf/bbox-clip" "^6.0.3"
+    "@turf/difference" "^6.0.2"
+    "@turf/intersect" "^6.1.3"
+    "@turf/union" "^6.0.3"
+    async "^3.2.0"
+    boundingbox "^1.2.3"
+    browserify-shim "^3.8.14"
+    bzip2 "^0.1.1"
+    event-emitter "^0.3.5"
+    lodash "^4.17.20"
+    lokijs "^1.5.11"
+    osmtogeojson "^3.0.0-beta.4"
+    strsearch2regexp "^0.1.1"
+    weight-sort "^1.3.1"
+    xmlhttprequest "*"
+
+overpass-layer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/overpass-layer/-/overpass-layer-3.0.0.tgz#95ca41cf1f6020cf4c51981f68429c1cf62c0f04"
+  integrity sha512-1ZlVJ0ppC5rYVi1zd6lii8f2bH89C7tBNWFsQnqPg7eQqZ3DkcdzVW3goPxV/CgxZUS1r4Ke55ST7eS1mxmiWg==
+  dependencies:
+    "@turf/along" "^6.0.1"
+    "@turf/length" "^6.0.2"
+    "@turf/point-on-feature" "^5.1.5"
+    boundingbox "^1.2.3"
+    browserify-css "^0.15.0"
+    event-emitter "^0.3.5"
+    html-escape "^2.0.0"
+    nearest-point-on-geometry "^1.0.1"
+    overpass-frontend "^2.4.13"
+    twig "^1.15.4"
+
 p-each-series@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a"
@@ -8564,6 +9093,11 @@ pascalcase@^0.1.1:
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
+patch-text@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/patch-text/-/patch-text-1.0.2.tgz#4bf36e65e51733d6e98f0cf62e09034daa0348ac"
+  integrity sha1-S/NuZeUXM9bpjwz2LgkDTaoDSKw=
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -8746,10 +9280,10 @@ polygon-clipping@^0.15.2:
   dependencies:
     splaytree "^3.1.0"
 
-popper.js@>=1.12.9:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz#2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3"
-  integrity sha512-+G+EkOPoE5S/zChTpmBSSDYmhXJ5PsW8eMhH8cP/CQHMFPBG/kC9Y5IIw6qNYgdJ+/COf0ddY2li28iHaZRSjw==
+popper.js@^1.16.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+  integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
 portscanner@2.1.1:
   version "2.1.1"
@@ -9290,6 +9824,13 @@ remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
+rename-function-calls@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/rename-function-calls/-/rename-function-calls-0.1.1.tgz#7f83369c007a3007f6abe3033ccf81686a108e01"
+  integrity sha1-f4M2nAB6MAf2q+MDPM+BaGoQjgE=
+  dependencies:
+    detective "~3.1.0"
+
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
@@ -9326,6 +9867,16 @@ replace-homedir@^1.0.0:
     is-absolute "^1.0.0"
     remove-trailing-separator "^1.1.0"
 
+replace-requires@~1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/replace-requires/-/replace-requires-1.0.4.tgz#014b7330b6b9e2557b71043b66fb02660c3bf667"
+  integrity sha1-AUtzMLa54lV7cQQ7ZvsCZgw79mc=
+  dependencies:
+    detective "^4.5.0"
+    has-require "~1.2.1"
+    patch-text "~1.0.2"
+    xtend "~4.0.0"
+
 replacestream@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36"
@@ -9506,6 +10057,11 @@ resolve@^1.4.0:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@~0.6.1:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.6.3.tgz#dd957982e7e736debdf53b58a4dd91754575dd46"
+  integrity sha1-3ZV5gufnNt699TtYpN2RdUV13UY=
+
 resp-modifier@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
@@ -10009,6 +10565,13 @@ source-map@^0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
+source-map@~0.1.30:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
 sparkles@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
@@ -10329,6 +10892,13 @@ strip-bom@^4.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
+strip-css-comments@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz#7a5625eff8a2b226cf8947a11254da96e13dae89"
+  integrity sha1-elYl7/iisibPiUehElTaluE9rok=
+  dependencies:
+    is-regexp "^1.0.0"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -10356,6 +10926,11 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+strsearch2regexp@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/strsearch2regexp/-/strsearch2regexp-0.1.1.tgz#3e9ddb1df93c2552b49eef9ae3c7db23e53102d6"
+  integrity sha512-JW28a7y9IE2LpIqV4fJ7IOjTsO/5udSXF1pkeDB+AR4/PWtN9rLmZN134tFYwkcuCwA6QIYEB8l3jILtuMFm8w==
+
 strxml@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/strxml/-/strxml-0.0.0.tgz#8ff5314c8c874db0550673761a81e4d3f244145c"
@@ -10479,6 +11054,11 @@ ternary-stream@^3.0.0:
     merge-stream "^2.0.0"
     through2 "^3.0.1"
 
+ternary@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ternary/-/ternary-1.0.0.tgz#45702725608c9499d46a9610e9b0e49ff26f789e"
+  integrity sha1-RXAnJWCMlJnUapYQ6bDkn/JveJ4=
+
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -10519,6 +11099,14 @@ through2-filter@^3.0.0:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
+through2@2.0.x, through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
 through2@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
@@ -10534,14 +11122,6 @@ through2@^0.5.0:
     readable-stream "~1.0.17"
     xtend "~3.0.0"
 
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
 through2@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
@@ -10565,6 +11145,14 @@ through2@~0.2.3:
     readable-stream "~1.1.9"
     xtend "~2.1.1"
 
+through2@~0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
+  integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
+  dependencies:
+    readable-stream "~1.0.17"
+    xtend "~2.1.1"
+
 through2@~0.6.3:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
@@ -10573,7 +11161,7 @@ through2@~0.6.3:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-through@2, through@^2.3.6, through@^2.3.8:
+through@2, through@^2.3.6, through@^2.3.8, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -10781,6 +11369,13 @@ tr46@^2.0.2:
   dependencies:
     punycode "^2.1.1"
 
+transformify@~0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/transformify/-/transformify-0.1.2.tgz#9a4f42a154433dd727b80575428a3c9e5489ebf1"
+  integrity sha1-mk9CoVRDPdcnuAV1Qoo8nlSJ6/E=
+  dependencies:
+    readable-stream "~1.1.9"
+
 traverse@0.6.x:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
@@ -10813,6 +11408,16 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+twig@^1.15.4:
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/twig/-/twig-1.15.4.tgz#314b00eaf98a57e70ed7dcfd6def93d0d8f3d627"
+  integrity sha512-gRpGrpdf+MswqF6eSjEdYZTa/jt3ZWHK/NU59IbTYJMBQXJ1W+7IxaGEwLkQjd+mNT15j9sQTzQumxUBkuQueQ==
+  dependencies:
+    "@babel/runtime" "^7.8.4"
+    locutus "^2.0.11"
+    minimatch "3.0.x"
+    walk "2.3.x"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -11149,6 +11754,13 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
+walk@2.3.x:
+  version "2.3.14"
+  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.14.tgz#60ec8631cfd23276ae1e7363ce11d626452e1ef3"
+  integrity sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==
+  dependencies:
+    foreachasync "^3.0.0"
+
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
@@ -11166,6 +11778,11 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
+weight-sort@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/weight-sort/-/weight-sort-1.3.1.tgz#a97c22f2f67aba95e356caea8ade35b22cb12f25"
+  integrity sha512-RjG1sFtn0lMOsbdE9YnN2xA7ccKRWMGN71Z+bLeZ1qqMg1z3kcspCJQajBKGHdqXugGr2z80ENhf3B/UdF2aCw==
+
 wgs84@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/wgs84/-/wgs84-0.0.0.tgz#34fdc555917b6e57cf2a282ed043710c049cdc76"
@@ -11314,6 +11931,11 @@ xmlhttprequest-ssl@~1.5.4:
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
   integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
+xmlhttprequest@*:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
+  integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
+
 "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"