diff --git a/www/locale/ar/LC_MESSAGES/django.po b/www/locale/ar/LC_MESSAGES/django.po
index b67663e5..4040e2cb 100644
--- a/www/locale/ar/LC_MESSAGES/django.po
+++ b/www/locale/ar/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 14:39+0000\n"
 "Last-Translator: Omar Anwar <omaraglan91@yahoo.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/dittaeva/maposmatic/language/"
@@ -646,7 +646,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -754,29 +754,29 @@ msgstr "مربع إحاطة"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -1000,69 +1000,87 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Search for a map"
+msgid "Search overlay"
+msgstr "أبحث عن خريطة"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1071,119 +1089,119 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 #, fuzzy
 #| msgid "Map title required"
 msgid "Map title"
 msgstr "عنوان الخريطة مطلوب"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1517,6 +1535,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/ast/LC_MESSAGES/django.po b/www/locale/ast/LC_MESSAGES/django.po
index 7e295c65..27ca1e0c 100644
--- a/www/locale/ast/LC_MESSAGES/django.po
+++ b/www/locale/ast/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2018-01-09 17:19+0000\n"
 "Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
 "Language-Team: Asturian (http://www.transifex.com/dittaeva/maposmatic/"
@@ -798,7 +798,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -967,22 +967,22 @@ msgstr "Cuadru de seleición"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Diseñu"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Fueya d'estilu"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -991,7 +991,7 @@ msgstr "Detalles del mapa"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1237,77 +1237,97 @@ msgstr "Nengún mapa casa cola to consulta"
 msgid "Create a new map!"
 msgstr "¡Crea un mapa nuevu!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Detalles del mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Detalles del mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Xenera un mapa propiu"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Configuración llocal del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Fueya d'estilu"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Tamañu del papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Xenerar"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Área xeográfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Buscar ciudá"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Detalles del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Seleición d'área xeográfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1330,13 +1350,13 @@ msgstr ""
 "seleiciona la llingüeta <em>Área xeográfica</em> y usa'l mini-mapa pa\n"
 "definir les llendes del área dibuxada."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Diseñu de múltiples páxines"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1359,13 +1379,13 @@ msgstr ""
 "del propiu mapa. Nota que la fueya d'estilu tamién configura qué detalles\n"
 "van vese nel mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Fueya d'estilu"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1387,32 +1407,32 @@ msgstr ""
 "del propiu mapa. Nota que la fueya d'estilu tamién configura qué detalles\n"
 "van vese nel mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Detalles del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Tamañu del papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Hebo un error al algamar los tamaños de papel compatibles."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1422,75 +1442,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Calculando los formatos de "
 "papel disponibles pal mapa..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formatu y tamañu del papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Seleiciona'l formatu, tamañu y orientación que desees pal mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Títulu del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Configuración llocal del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Llimpiar l'área seleicionada"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Resume"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Llugar:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Diseñu:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Fueya d'estilu:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Detalles del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Formatu del papel:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "¡Casi tamos!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1830,6 +1850,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Escribe pa recibir suxerencies..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Seleición d'área xeográfica"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Esperando que principie'l dibuxáu..."
@@ -1989,6 +2023,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Daemon de dibuxáu:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Daemon de dibuxáu:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Daemon de dibuxáu:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Diseñu de páxina completa ensin índiz de cais"
 
diff --git a/www/locale/az/LC_MESSAGES/django.po b/www/locale/az/LC_MESSAGES/django.po
index 37a069fa..88be6fce 100644
--- a/www/locale/az/LC_MESSAGES/django.po
+++ b/www/locale/az/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/maposmatic/"
@@ -632,7 +632,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -740,29 +740,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -982,69 +982,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1053,117 +1069,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1497,6 +1513,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/be/LC_MESSAGES/django.po b/www/locale/be/LC_MESSAGES/django.po
index 5e51931f..521fd9de 100644
--- a/www/locale/be/LC_MESSAGES/django.po
+++ b/www/locale/be/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 17:31+0000\n"
 "Last-Translator: Viktar Palstsiuk <vipals@gmail.com>\n"
 "Language-Team: Belarusian (http://www.transifex.com/dittaeva/maposmatic/"
@@ -773,7 +773,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -942,22 +942,22 @@ msgstr "Выдзеленая вобласць"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Макет старонкі"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Стыль"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -966,7 +966,7 @@ msgstr "Падрабязней пра мапу"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1212,77 +1212,97 @@ msgstr "Няма мапаў, што адпавядаюць Вашаму запы
 msgid "Create a new map!"
 msgstr "Стварыць новую мапу!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Падрабязней пра мапу"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Падрабязней пра мапу"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Стварыць уласную мапу"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Мова мапы"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Стыль"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Памер паперы"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Стварыць мапу"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Геаграфічная вобласць"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Пошук горада"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Падрабязней пра мапу"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Выдзяленне геаграфічнай вобласці"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1305,13 +1325,13 @@ msgstr ""
 "вобласць самастойна, выберыце ўкладку <em>Геаграфічная вобласць</em> і "
 "выкарыстоўвайце міні-мапу, каб задаць межы патрэбнай вобласці."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Мапа на некалькіх аркушах"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1332,13 +1352,13 @@ msgstr ""
 "пераплёту. Стыль мапы вызначае знешні выгляд самой мапы. Звярніце ўвагу, што "
 "стыль таксама вызначае, якія дэталі будуць бачныя на мапе."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Стыль"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1358,32 +1378,32 @@ msgstr ""
 "пераплёту. Стыль мапы вызначае знешні выгляд самой мапы. Звярніце ўвагу, што "
 "стыль таксама вызначае, якія дэталі будуць бачныя на мапе."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Падрабязней пра мапу"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Памер паперы"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Адбылася памылка пры пошуку падыходзячых памераў паперы"
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1393,75 +1413,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Вызначэнне падыходзячых "
 "фарматаў паперы для Вашай мапы..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Фармат і памер паперы"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Абярыце пажаданы фармат, памер і арыентацыю для Вашай мапы."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Назва мапы"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Мова мапы"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Ачысціць выдзеленую вобласць"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Рэзюмэ"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Месцазнаходжанне:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Макет:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Стыль:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Падрабязней пра мапу"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Фармат паперы:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Амаль скончана!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1801,6 +1821,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Пачніце друкаваць, каб убачыць даступныя гарады..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Выдзяленне геаграфічнай вобласці"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Запыт на стварэнне мапы дададзены ў чаргу..."
@@ -1962,6 +1996,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Сэрвіс стварэння мапы:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Сэрвіс стварэння мапы:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Сэрвіс стварэння мапы:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Мапа на адным аркушы без пераліку вуліц"
 
diff --git a/www/locale/ca/LC_MESSAGES/django.po b/www/locale/ca/LC_MESSAGES/django.po
index 13046b7f..f13b42c0 100644
--- a/www/locale/ca/LC_MESSAGES/django.po
+++ b/www/locale/ca/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-05-07 10:44+0000\n"
 "Last-Translator: Joan Montané <joan@montane.cat>\n"
 "Language-Team: Catalan <http://translate.get-map.org/projects/maposmatic/"
@@ -770,7 +770,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Endavant"
 
@@ -906,29 +906,29 @@ msgstr "Àrea geogràfica"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Composició"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Estil"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Superposicions"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1154,60 +1154,80 @@ msgstr "No hi ha cap mapa coincident amb la petició."
 msgid "Create a new map!"
 msgstr "Crea un mapa nou!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "Superposicions"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Superposicions del mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Genereu el vostre propi mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Enrere"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Àrea del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Estil"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Paper"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Tramet"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Genera"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Àrea geogràfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Cerca de ciutat"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Umap data file"
 msgid "Upload files"
 msgstr "Fitxer de dades d'Umap"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 #, fuzzy
 #| msgid ""
 #| "<b>Note:</b> The uploaded file will not be made available to anyone, the "
@@ -1223,11 +1243,11 @@ msgstr ""
 ">Per tant, <b>no</b> pugeu cap dada que no vulgueu que sigui visible "
 "públicament."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Selecció d'àrea geogràfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1241,11 +1261,11 @@ msgstr ""
 "seleccioneu la pestanya <em>Àrea geogràfica</em> i useu el minimapa per a "
 "definir els límits de l'àrea renderitzada."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Composició del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1255,11 +1275,11 @@ msgstr ""
 "<em>Multipàgina</em> produeix un fullet molt adient per a imprimir i "
 "enquadernar."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Estil del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1267,11 +1287,11 @@ msgstr ""
 "El disseny del mapa determina l'estil i l'aspecte del propi mapa. Noteu que "
 "el disseny també determina els detalls que seran visibles al mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Superposicions del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1281,87 +1301,87 @@ msgstr ""
 "triat. Podeu seleccionar diferents superposicions per a afegir informació "
 "addicionals sobre el mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Mida del paper"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "S'ha produït un error en obtenir les mides de paper compatibles."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "S'estan calculant els formats de paper disponibles per al mapa..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Mida i format del paper"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Seleccioneuel format, mida i orientació desitjats pel mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Títol del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Llengua"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "La adreça electrònica (per a les notificacions, opcional)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Neteja l'àrea seleccionada"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Resum"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Ubicació:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Composició:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Estil:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Superposició:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Format del paper:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Gairebé hem acabat!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1697,6 +1717,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Escriviu per veure suggeriments..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Selecció d'àrea geogràfica"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "S'està esperant l'inici de la renderització..."
@@ -1854,6 +1888,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "La renderització ha fallat!"
 
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "La renderització ha fallat!"
+
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "La renderització ha fallat!"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Composició a pàgina completa sense índex de carrers"
 
diff --git a/www/locale/cs/LC_MESSAGES/django.po b/www/locale/cs/LC_MESSAGES/django.po
index d1ad5daf..d20f7700 100644
--- a/www/locale/cs/LC_MESSAGES/django.po
+++ b/www/locale/cs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-06-29 10:32+0000\n"
 "Last-Translator: Jose Riha <jose1711@gmail.com>\n"
 "Language-Team: Czech <http://translate.get-map.org/projects/maposmatic/"
@@ -771,7 +771,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -935,29 +935,29 @@ msgstr "ohraničovací rámeček"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Rozvržení"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Stylopis"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1201,77 +1201,97 @@ msgstr "Žádná mapa neodpovídá vašemu dotazu."
 msgid "Create a new map!"
 msgstr "Vytvořit novou mapu!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Detaily mapy"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Detaily mapy"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Vytvořit vlastní mapu"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Mapovat místně"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Stylopis"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Velikost papíru"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Vytvořit"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Zeměpisná oblast"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Vyhledávání města"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Detaily mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Výběr zeměpisné oblasti"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1294,13 +1314,13 @@ msgstr ""
 "<em>Zeměpisná oblast</em> a pomocí miniatury mapy nastavte hranice "
 "vykreslené plochy."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Vícestránkové rozvržení"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1321,13 +1341,13 @@ msgstr ""
 "tisk a vazbu. Šablona stylopisů mapy určuje styl a vzhled samotné mapy. "
 "Všimněte si, že stylopis také řídí, jaké detaily budou na mapě viditelné."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Stylopis"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1347,32 +1367,32 @@ msgstr ""
 "tisk a vazbu. Šablona stylopisů mapy určuje styl a vzhled samotné mapy. "
 "Všimněte si, že stylopis také řídí, jaké detaily budou na mapě viditelné."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Detaily mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Velikost papíru"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Během načítání kompatibilních formátů papíru došlo k chybě."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"icon-refresh\"></i> Calculating available paper formats for "
@@ -1381,73 +1401,73 @@ msgid "Calculating available paper formats for your map..."
 msgstr ""
 "<i class=\"icon-refresh\"></i>Výpočet dostupných formátů papíru pro mapu ..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formát a velikost papíru"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Vyberte požadovaný formát, velikost a orientaci mapy."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Název mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Mapovat místně"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Vymazat vybranou oblast"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Shrnutí"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Umístění:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Rozložení:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Stylopis: "
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Formát papíru:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Téměř tady!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1787,6 +1807,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Začněte psát návrhy ..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Výběr zeměpisné oblasti"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Čekání na začátek vykreslování..."
@@ -1953,6 +1987,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Vykreslovací démon"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Vykreslovací démon"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Vykreslovací démon"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Rozložení celé stránky bez indexu ulic"
 
diff --git a/www/locale/da/LC_MESSAGES/django.po b/www/locale/da/LC_MESSAGES/django.po
index fc90d836..32eef6e2 100644
--- a/www/locale/da/LC_MESSAGES/django.po
+++ b/www/locale/da/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2012-12-16 21:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/maposmatic/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/de/LC_MESSAGES/django.po b/www/locale/de/LC_MESSAGES/django.po
index 5c6a6286..f181726f 100644
--- a/www/locale/de/LC_MESSAGES/django.po
+++ b/www/locale/de/LC_MESSAGES/django.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2021-09-21 21:18+0000\n"
 "Last-Translator: Hartmut Holzgraefe <hartmut@php.net>\n"
 "Language-Team: German <https://translate.get-map.org/projects/maposmatic/"
@@ -77,10 +77,8 @@ msgid "Layout required"
 msgstr "Layout erforderlich"
 
 #: www/maposmatic/forms.py:198
-#, fuzzy
-#| msgid "Stylesheet required"
 msgid "Indexer required"
-msgstr "Stil erforderlich"
+msgstr "Indexer erforderlich"
 
 #: www/maposmatic/forms.py:203
 msgid "Stylesheet required"
@@ -578,10 +576,8 @@ msgid "Platform status"
 msgstr "Plattform-Status"
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:14
-#, fuzzy
-#| msgid "Rendering daemon: "
 msgid "Rendering queue(s): "
-msgstr "Render-Daemon: "
+msgstr "Render-Warteschlange(n): "
 
 #: www/maposmatic/templates/maposmatic/base-parts/navbar.html:15
 msgid "GIS database: "
@@ -784,7 +780,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Weiter"
 
@@ -920,29 +916,29 @@ msgstr "Begrenzungsrahmen"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Layout"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Kartenstil"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Overlays"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1166,51 +1162,67 @@ msgstr "Keinen Pläne zu Ihrem Suchbegriff gefunden."
 msgid "Create a new map!"
 msgstr "Einen neuen Plan erstellen!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr "Overlay(s) auswählen" 
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr "Overlay suchen"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr "Keine Ergebnisse"
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Erzeugen Sie Ihren eigenen Plan"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Zurück"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Gebiet"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Stil"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Papierformat"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Erstellen"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Erzeugen"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Geografisches Gebiet"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Suche nach Orten"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr "Datei(en) hochladen"
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr "Dateien hochlanden"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
@@ -1221,7 +1233,7 @@ msgstr ""
 "Dateiauswahldialog erneut öffnen, um Dateien auszuwählen, ersetzt Ihre "
 "Auswahl die vorherige."
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
@@ -1232,11 +1244,11 @@ msgstr ""
 ">Laden Sie bitte <b>KEINE</b> Daten hoch die nicht öffentlich sichtbar sein "
 "sollen."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Geografische Auswahl des Gebietes"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1250,11 +1262,11 @@ msgstr ""
 "klicken Sie auf den Tab <em>Geografisches Gebiet</em> und markieren Sie auf "
 "der Karte das gewünschte Gebiet."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Karten-Layout"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1264,11 +1276,11 @@ msgstr ""
 "<em>mehrseitige Layout</em> erzeugt ein Broschürenformat, das bequem zu "
 "drucken und binden ist."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Kartenstil"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1276,11 +1288,11 @@ msgstr ""
 "Der Kartenstil legt das Aussehen der Karte fest, weiterhin bestimmt er "
 "welche Details aif der Karte sichtbar sein werden."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Karten-Overlays"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1290,31 +1302,31 @@ msgstr ""
 "Kartenobjekte hinzufügen. Sie können mehrere Overlays auswählen um "
 "verschiedene Arten von zusätzlichen Informationen zur Karte hinzuzufügen."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Papierformat"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr "(Breite x Höhe)"
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Bei der Suche nach passenden Papierformaten trat ein Fehler auf."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "Bestimme die für Ihre Karte verfügbaren Papierformate ..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Papierformat und -größe"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Wählen Sie Format, Größe und Ausrichtung für Ihre Karte."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
@@ -1323,55 +1335,55 @@ msgstr ""
 "\" Größe für den ausgewählten Kartenbereich auswählen oder eine Breite und "
 "Höhe Ihrer Wahl angeben."
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Name des Stadtplans"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Sprache"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "Ihre Email-Adresse (für Benachrichtigungen, optional)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr "wird gelöscht nach"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr "Stunden"
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Ort:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Layout:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Darstellungsstil:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Overlay:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Papierformat:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Fast fertig!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1880,6 +1892,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Tippen Sie, um Vorschläge zu erhalten..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr "Ausschnit auswählen"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr "Auswahl aufheben"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr "Aktuelle Ansicht auswählen"
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Auf den Beginn des Rendervorgangs wartend..."
diff --git a/www/locale/el/LC_MESSAGES/django.po b/www/locale/el/LC_MESSAGES/django.po
index 3af5d053..b114a657 100644
--- a/www/locale/el/LC_MESSAGES/django.po
+++ b/www/locale/el/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2015-01-04 17:34+0000\n"
 "Last-Translator: Konstantinos Stampoulis\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/maposmatic/"
@@ -822,7 +822,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -994,22 +994,22 @@ msgstr "Πλαίσιο οριοθέτησης"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Σχέδιο"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Στυλ"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -1018,7 +1018,7 @@ msgstr "Λεπτομέρειες χάρτη"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1265,77 +1265,97 @@ msgstr "Δεν βρέθηκε χάρτης που ταιριάζει το ερώ
 msgid "Create a new map!"
 msgstr "Δημιουργήστε νέο χάρτη!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Λεπτομέρειες χάρτη"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Λεπτομέρειες χάρτη"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Δημιουργήστε το δικό σας χάρτη"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Τοπικές ρυθμίσεις χάρτη"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Στυλ"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Μέγεθος χαρτιού"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Δημιουργία"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Γεωγραφική περιοχή"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Αναζήτηση πόλης"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Λεπτομέρειες χάρτη"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Επιλογή γεωγραφικής περιοχής"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1360,13 +1380,13 @@ msgstr ""
 "μικρό χάρτη για να ορίσετε\n"
 "τα όρια της παρεχόμενης περιοχής."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Πολυσέλιδη διάταξη"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1390,13 +1410,13 @@ msgstr ""
 "είναι\n"
 "ορατά στον χάρτη."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Στυλ"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1419,32 +1439,32 @@ msgstr ""
 "είναι\n"
 "ορατά στον χάρτη."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Λεπτομέρειες χάρτη"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Μέγεθος χαρτιού"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Παρουσιάστηκε σφάλμα κατά την ανάκτηση συμβατών μεγεθών χαρτιού."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1454,77 +1474,77 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Υπολογισμός διαθέσιμων μορφών "
 "χαρτιού για τον χάρτη σας..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Μορφή και μέγεθος χαρτιού"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 "Επιλέξτε την επιθυμητή μορφή, το μέγεθος και τον προσανατολισμό του χάρτη "
 "σας."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Τίτλος χάρτη"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Τοπικές ρυθμίσεις χάρτη"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Εκκαθάριση επιλεγμένης περιοχής"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Περίληψη"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Περιοχή:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Σχέδιο:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Στυλ:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Λεπτομέρειες χάρτη"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Είδος χαρτιού:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Σχεδόν φτάσαμε!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1865,6 +1885,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Ξεκινήστε να πληκτρολογείτε για προτάσεις..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Επιλογή γεωγραφικής περιοχής"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Αναμονή για να ξεκινήσει η επεξεργασία..."
@@ -2028,6 +2062,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Διακομιστής επεξεργασίας:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Διακομιστής επεξεργασίας:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Διακομιστής επεξεργασίας:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Ολοσέλιδη διάταξη χωρίς ευρετήριο οδών"
 
diff --git a/www/locale/en@pirate/LC_MESSAGES/django.po b/www/locale/en@pirate/LC_MESSAGES/django.po
index f9b3173a..9e71f3da 100644
--- a/www/locale/en@pirate/LC_MESSAGES/django.po
+++ b/www/locale/en@pirate/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/"
@@ -632,7 +632,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -740,29 +740,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -982,69 +982,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1053,117 +1069,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1497,6 +1513,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/eo/LC_MESSAGES/django.po b/www/locale/eo/LC_MESSAGES/django.po
index ee5476d4..f87b904d 100644
--- a/www/locale/eo/LC_MESSAGES/django.po
+++ b/www/locale/eo/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-12-04 10:53+0000\n"
 "Last-Translator: abatelle <rrrubego@riseup.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/maposmatic/"
@@ -748,7 +748,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -915,22 +915,22 @@ msgstr "Ĉirkaŭa rektangulo"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Aranĝo"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Stilfolio"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -939,7 +939,7 @@ msgstr "Map-detaloj"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1185,77 +1185,97 @@ msgstr "Neniu mapo korespondas kun via demando."
 msgid "Create a new map!"
 msgstr "Krei novan mapon!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Map-detaloj"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Map-detaloj"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Krei vian propran mapon"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Lingvo de la mapo"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Stilfolio"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Grando de papero"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Bildigi"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Geografia areo"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Serĉi urbon"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Map-detaloj"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Elekto de geografia areo"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1278,13 +1298,13 @@ msgstr ""
 "langeton <em>Geografia areo</em> kaj uzu la malgrandan mapon por montri la "
 "bezonatan areon."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Plurpaĝa aranĝo"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1305,13 +1325,13 @@ msgstr ""
 "stilfolio vi povas elekti la stilon de la mapo mem. Tiu elekto ŝanĝos ankaŭ "
 "tiujn, kiuj detaloj videblos sur la mapo."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Stilfolio"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1331,32 +1351,32 @@ msgstr ""
 "stilfolio vi povas elekti la stilon de la mapo mem. Tiu elekto ŝanĝos ankaŭ "
 "tiujn, kiuj detaloj videblos sur la mapo."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Map-detaloj"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Grando de papero"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Eraro okazis dum kiam ni serĉis kongruajn paper-grandojn."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1366,75 +1386,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Kalkulado de disponeblaj paper-"
 "formatoj por via mapo..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formato kaj grando de papero"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Elektu la bezonatan formaton, grandon kaj orientiĝon por via mapo."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Map-titolo"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Lingvo de la mapo"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Forigi la elektitan areon"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Resumo"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Loko:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Aranĝo:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Stilfolio:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Map-detaloj"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Paper-formato:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Preskaŭ finis...!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1774,6 +1794,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Komencu tajpi por vidi proponojn..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Elekto de geografia areo"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Baldaŭ ekkreiĝos la karto..."
@@ -1931,6 +1965,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Bildiga demono:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Bildiga demono:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Bildiga demono:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Tutpaĝa aranĝo, sen stratindekso"
 
diff --git a/www/locale/es/LC_MESSAGES/django.po b/www/locale/es/LC_MESSAGES/django.po
index 7a228858..82040391 100644
--- a/www/locale/es/LC_MESSAGES/django.po
+++ b/www/locale/es/LC_MESSAGES/django.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-08-05 21:31+0000\n"
 "Last-Translator: Hartmut Holzgraefe <hartmut@php.net>\n"
 "Language-Team: Spanish <http://translate.get-map.org/projects/maposmatic/"
@@ -722,7 +722,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Siguiente"
 
@@ -867,29 +867,29 @@ msgstr "Cuadro delimitador"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Disposición"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Hoja de estilo"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Superposiciones"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1119,73 +1119,93 @@ msgstr "Ningún mapa coincide con tu consulta."
 msgid "Create a new map!"
 msgstr "¡Crear un nuevo mapa!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Detalles del mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Detalles del mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Genere su propio mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Atrás"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Mapa local"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Estilo"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Enviar"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Generar"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Área geografica"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Buscar ciudad"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Detalles del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Seleccionar área geografica"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1194,57 +1214,57 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Diseño de varias páginas"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Hoja de estilo"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Detalles del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Tamaño del papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Se produjo un error al recuperar los tamaños de papel compatibles."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1254,76 +1274,76 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Calculando los formatos de "
 "papel disponibles para el mapa..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formato y tamaño del papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 "Seleccione el formato, el tamaño y la orientación deseado para el mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Título del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Mapa local"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "Su dirección de correo electrónico (para notificaciones, opcional)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Borrar área seleccionada"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Resumen"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Localización:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Disposición:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Hojas de estilo:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Detalles del mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Formato del papel:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Casi listo!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1660,6 +1680,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Empieza a escribir para sugerencias..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Seleccionar área geografica"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Esperando por el renderizado para empezar..."
@@ -1819,6 +1853,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Renderizando..."
 
+#, fuzzy
+#~| msgid "Rendering..."
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Renderizando..."
+
+#, fuzzy
+#~| msgid "Rendering..."
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Renderizando..."
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Diseño de página completa sin índice de calles"
 
diff --git a/www/locale/et/LC_MESSAGES/django.po b/www/locale/et/LC_MESSAGES/django.po
index 7ee4fdd6..9b4cbb38 100644
--- a/www/locale/et/LC_MESSAGES/django.po
+++ b/www/locale/et/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2014-04-13 17:28+0000\n"
 "Last-Translator: jaakl <jaak@letsdoitworld.org>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/maposmatic/"
@@ -675,7 +675,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -786,22 +786,22 @@ msgstr "Kaardi ala"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Kujundus"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Stiilikirjeldus"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -810,7 +810,7 @@ msgstr "Kaardi detailid"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1056,77 +1056,97 @@ msgstr "Kaarti ei leitud."
 msgid "Create a new map!"
 msgstr "Loo uus kaart!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Kaardi detailid"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Kaardi detailid"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Genereeri enda kaart"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Kaardi keel"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Stiilikirjeldus"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Paberi suurus"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Genereeri"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Geograafiline ala"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Linna otsing"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Kaardi detailid"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Geograafilise ala valik"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1135,57 +1155,57 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Mitme leheküljega kujundus"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Stiilikirjeldus"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Kaardi detailid"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Paberi suurus"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Paberisuuruste lugemisel tekkis viga."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1195,75 +1215,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Arvutan võmalikke paberimõõte "
 "su kaardi jaoks..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Paberi formaat ja suurus"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Vali kaardi formaat, suurus ja orientatsioon."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Kaardi pealkiri"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Kaardi keel"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Puhasta valitud ala"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Kujundus:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Stiil:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Kaardi detailid"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Paberi formaat:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Peaaegu valmis!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1597,6 +1617,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Alusta sisestust soovitusteks..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Geograafilise ala valik"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Oota kui renderdus algab..."
@@ -1754,6 +1788,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Renderduse teenus: "
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Renderduse teenus: "
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Renderduse teenus: "
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Täis-lehekülg ilma tänavaindeksita"
 
diff --git a/www/locale/eu/LC_MESSAGES/django.po b/www/locale/eu/LC_MESSAGES/django.po
index 4273ad59..eff926b9 100644
--- a/www/locale/eu/LC_MESSAGES/django.po
+++ b/www/locale/eu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2021-11-08 04:38+0000\n"
 "Last-Translator: Mikel Larreategi <larreategi@gmail.com>\n"
 "Language-Team: Basque <https://translate.get-map.org/projects/maposmatic/"
@@ -707,7 +707,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Hurrengoa"
 
@@ -838,29 +838,29 @@ msgstr "Muga-kutxa"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Maketazioa"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Estilo-orria"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Geruzak"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1084,51 +1084,71 @@ msgstr "Mapa bat ere ez dator zure kontsultarekin bat."
 msgid "Create a new map!"
 msgstr "Sortu mapa berria!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "Geruza(k)"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Maparen geruzak"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Sortu zure mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Atzera"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Maparen ingurunea"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Estiloa"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Papera"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Bidali"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Sortu"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Ingurune geografikoa"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Hiria bilatu"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr "Fitxategia kargatu"
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr "Fitxategiak kargatu"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
@@ -1138,7 +1158,7 @@ msgstr ""
 "ere aukeratu dezakezu. Fitxategiak aukeratzeko leihoa berriz irekitzen "
 "baduzu, aurrez aukeratutakoak galdu egingo dituzu."
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
@@ -1148,11 +1168,11 @@ msgstr ""
 "egongo dira, fitxategi hau erabiliz sortutako mapa <b>publikoa izango da</b>."
 "<br/><b>Ez</b> kargatu publikoa izan nahi ez duzun fitxategirik."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Aukeratu ingurune geografikoa"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1165,11 +1185,11 @@ msgstr ""
 "aukeratu nahi baduzu aukeratu <em>Inguru geografikoa</em> fitxa eta erabili "
 "mapa txikia ingurua aukeratzeko."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Maparen formatua"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1179,11 +1199,11 @@ msgstr ""
 "<em>Orrialde anitzeko formatuak</em> inprimatu eta grapatzeko egokia den "
 "formatua sortzen du."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Maparen estilo-orria"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1191,11 +1211,11 @@ msgstr ""
 "Maparen estilo-orriak maparen itxura zehazten du. Estilo-orriak mapan "
 "ikusiko diren xehetasunak zehazten ditu."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Maparen geruzak"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1204,31 +1224,31 @@ msgstr ""
 "Geruzetan aukeratutako maparen gainean informazio gehigarria zehazten da. "
 "Hainbat geruza aukeratu ditzakezu horrela informazio gehiago edukitzeko."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Paperaren tamaina"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr "(zabalera x altuera)"
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Errore bat gertatu da paper tamainak lortzean."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "Zure maparentzat eskuragarri dauden paper formatuak kalkulatzen..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Paperaren formatu eta tamaina"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Aukeratu maparen formatu, tamaina eta paperaren orientazioa."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
@@ -1236,55 +1256,55 @@ msgstr ""
 "Aukeratutako tamaina estandarrak aukeratu ditzakezu, mapako inguru onenaren "
 "zatia, edo zuk nahi duzun tamaina ere aukeratu dezakezu."
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Maparen izenburua"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Hizkuntza"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "Zure posta elektronikoa (jakinarazpenak bidaltzeko, hautazkoa)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr "denbora honen ostean ezabatuko da"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr "ordu"
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Laburpena"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Kokalekua:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Itxura:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Estilo-orriak:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Geruza:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Paperaren formatua:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Ia prest!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1631,6 +1651,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Aukeratu ingurune geografikoa"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/fa/LC_MESSAGES/django.po b/www/locale/fa/LC_MESSAGES/django.po
index b7363ab3..d0097e90 100644
--- a/www/locale/fa/LC_MESSAGES/django.po
+++ b/www/locale/fa/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2018-03-20 08:50+0000\n"
 "Last-Translator: imni <iriman@chmail.ir>\n"
 "Language-Team: Persian (http://www.transifex.com/dittaeva/maposmatic/"
@@ -793,7 +793,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -960,22 +960,22 @@ msgstr "محدوده"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "طرح"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "سبک"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -984,7 +984,7 @@ msgstr "جزئیات نقشه"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1230,77 +1230,97 @@ msgstr "نقشه‌ای مطابق جستجوی شما پیدا نشد."
 msgid "Create a new map!"
 msgstr "یک نقشهٔ جدید بسازید!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "جزئیات نقشه"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "جزئیات نقشه"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "نقشهٔ خودتان را بسازید"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "زبان نقشه"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "سبک"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "اندازهٔ کاغذ"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "بساز"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "ناحیهٔ جغرافیایی"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "جستجوی شهر"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "جزئیات نقشه"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "انتخاب ناحیهٔ جغرافیایی"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1324,13 +1344,13 @@ msgstr ""
 "<em>منطقهٔ جغرافیایی</em> بروید و با استفاده از نقشهٔ کوچک\n"
 "محدودهٔ موردنظرتان را مشخص کنید."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "چندصفحه‌ای"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1353,13 +1373,13 @@ msgstr ""
 "می‌کند که چه جزئیاتی\n"
 "روی نقشه نشان داده شود."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "سبک"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1381,32 +1401,32 @@ msgstr ""
 "می‌کند که چه جزئیاتی\n"
 "روی نقشه نشان داده شود."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "جزئیات نقشه"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "اندازهٔ کاغذ"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "هنگام دریافت اندازه‌های مناسب کاغذ خطایی رخ داد."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1416,75 +1436,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> در حال محاسبهٔ قالب‌های کاغذ "
 "مناسب برای نقشهٔ شما..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "قالب و اندازهٔ کاغذ"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "قالب، اندازه و جهت دلخواهتان را برای نقشه انتخاب کنید."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "نام نقشه"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "زبان نقشه"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "پاک‌کردن ناحیهٔ انتخابی"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "خلاصه"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "مکان:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "طرح:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "سبک:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "جزئیات نقشه"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "قالب کاغذ:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "تقریباً تمومه!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1824,6 +1844,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "برای دریافت پیشنهاد، شروع به نوشتن کنید..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "انتخاب ناحیهٔ جغرافیایی"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "انتظار تا شروع ساخت نقشه..."
@@ -1981,6 +2015,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "برنامهٔ رندرگیری: "
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "برنامهٔ رندرگیری: "
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "برنامهٔ رندرگیری: "
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "یک‌صفحه‌ای بدون فهرست خیابان‌ها"
 
diff --git a/www/locale/fi_FI/LC_MESSAGES/django.po b/www/locale/fi_FI/LC_MESSAGES/django.po
index a89da0b8..85b0bbb2 100644
--- a/www/locale/fi_FI/LC_MESSAGES/django.po
+++ b/www/locale/fi_FI/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2015-01-01 20:08+0000\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/"
@@ -691,7 +691,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -807,29 +807,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Tyylisivu"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1078,75 +1078,93 @@ msgstr "Yksikään kartta ei täsmää kyselyysi"
 msgid "Create a new map!"
 msgstr "Luo uusi kartta!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Search for a map"
+msgid "Search overlay"
+msgstr "Etsitään karttaa"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Tuota oma karttasi"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Tyylisivu"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Paperikoko"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Tuota"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Kaupunkihaku"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 #, fuzzy
 #| msgid "German translation"
 msgid "Geographic area selection"
 msgstr "saksalaislokalisointi"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1155,53 +1173,53 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Tyylisivu"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Paperikoko"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Tapahtui virhe noudettaessa yhteensopivia paperikokoja."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1211,73 +1229,73 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Lasketaan käytettävissä olevia "
 "paperimuotoja kartallesi..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Paperimuoto ja -koko"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Valitse haluttu muoto, koko ja suuntaus kartallesi."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Karttaotsikko"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map title"
 msgid "Locale"
 msgstr "Karttaotsikko"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Tyhjennä valittu alue"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Tyylisivu:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Paperimuoto:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1611,6 +1629,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Aloita ehdotusten kirjoittaminen..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "German translation"
+msgid "Remove selection"
+msgstr "saksalaislokalisointi"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Odotetaan renderoinnin alkamista..."
@@ -1772,6 +1804,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Renderointitaustaprosessi:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Renderointitaustaprosessi:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Renderointitaustaprosessi:"
+
 #, fuzzy
 #~| msgid "The rendering is in progress..."
 #~ msgid "The rendering daemon is running."
diff --git a/www/locale/fr/LC_MESSAGES/django.po b/www/locale/fr/LC_MESSAGES/django.po
index fe491c0b..e1ff8df4 100644
--- a/www/locale/fr/LC_MESSAGES/django.po
+++ b/www/locale/fr/LC_MESSAGES/django.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2021-11-06 02:59+0000\n"
 "Last-Translator: Loïc LE METAYER <loic.lemetayer@gmail.com>\n"
 "Language-Team: French <https://translate.get-map.org/projects/maposmatic/"
@@ -758,7 +758,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Suivant"
 
@@ -892,29 +892,29 @@ msgstr "Zone géographique"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Disposition"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Feuille de style"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Surcouches"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1138,51 +1138,71 @@ msgstr "Aucune carte ne correspond à votre recherche."
 msgid "Create a new map!"
 msgstr "Créer une nouvelle carte !"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "Couche(s)"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Couches"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Générer votre propre carte"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Retour"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Zone de la carte"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Style"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Papier"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Soumettre"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Générer"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Zone géographique"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Recherche par ville"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr "Importer un fichier"
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr "Import de fichiers"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
@@ -1192,7 +1212,7 @@ msgstr ""
 "sélectionner plusieurs fichiers simultanément. La réouverture de la fenêtre "
 "de sélection remplacera la liste précédemment sélectionnée."
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
@@ -1202,11 +1222,11 @@ msgstr ""
 "<b>Mais</b> la carte utilisant ce fichier le sera.<br/><b>NE</b> téléversez "
 "<b>PAS</b> de données si vous ne voulez pas qu'elles soient visibles de tous."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Sélection de la zone géographique"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1221,11 +1241,11 @@ msgstr ""
 "voulez par vous-même, passez dans l'onglet <em>Zone géographique</em> et "
 "utilisez la mini-carte pour définir les limites de la zone à traiter."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Mise en page de la carte"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1235,11 +1255,11 @@ msgstr ""
 "dans le rendu. La disposition <em>multi-page</em> produit un livret que vous "
 "pouvez facilement imprimer et relier."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Feuille de style cartographique"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1248,11 +1268,11 @@ msgstr ""
 "carte en elle-même. Notez que la feuille de style détermine aussi quels "
 "détails sont visibles sur la carte."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Couches"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1262,35 +1282,35 @@ msgstr ""
 "surcouches peuvent être choisies pour ajouter différentes informations "
 "complémentaires sur la carte."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Taille du papier"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr "(largeur × hauteur)"
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 "Une erreur est survenue lors de la récupération des formats de papier "
 "compatibles."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "Calcul des formats de papiers compatibles pour votre carte ..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Format et taille du papier"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 "Sélectionnez le format, la taille et l'orientation de papier désirée pour "
 "votre carte."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
@@ -1299,55 +1319,55 @@ msgstr ""
 "plus adaptée\" à la zone de carte sélectionnée, ou spécifier la hauteur et "
 "la largeur de votre choix."
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Titre de la carte"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Langue"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "Votre adresse mail (pour les notifications, facultatif)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr "sera supprimée après"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr "heure(s)"
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Résumé"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Emplacement :"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Disposition :"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Feuille de style :"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Couches :"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Format de papier :"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Vous y êtes presque !"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1887,6 +1907,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Commencez à écrire pour des suggestions…"
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Sélection de la zone géographique"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "En attente du début du rendu..."
diff --git a/www/locale/hr/LC_MESSAGES/django.po b/www/locale/hr/LC_MESSAGES/django.po
index 4bcc4aef..becfc353 100644
--- a/www/locale/hr/LC_MESSAGES/django.po
+++ b/www/locale/hr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/maposmatic/"
@@ -721,7 +721,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -831,29 +831,29 @@ msgstr "Područje (granični okvir)"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -1084,71 +1084,87 @@ msgstr ""
 msgid "Create a new map!"
 msgstr "Izradi kartu"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Izradi svoju kartu"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 #, fuzzy
 #| msgid "Create map"
 msgid "Generate"
 msgstr "Izradi kartu"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1157,119 +1173,119 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 #, fuzzy
 #| msgid "Map title required"
 msgid "Map title"
 msgstr "Naslov karte je obavezan"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1603,6 +1619,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/hu/LC_MESSAGES/django.po b/www/locale/hu/LC_MESSAGES/django.po
index 243b25f6..910d9712 100644
--- a/www/locale/hu/LC_MESSAGES/django.po
+++ b/www/locale/hu/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2022-01-29 15:14+0000\n"
 "Last-Translator: Gábor Babos <gabor.babos@gmail.com>\n"
 "Language-Team: Hungarian <https://translate.get-map.org/projects/maposmatic/"
@@ -746,7 +746,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Tovább"
 
@@ -883,29 +883,29 @@ msgstr "Határolókeret"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Elrendezés"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Stíluslap"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Fedőrétegek"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1129,51 +1129,71 @@ msgstr "Egyetlen térkép sem felel meg a lekérdezési feltételeknek."
 msgid "Create a new map!"
 msgstr "Új térkép létrehozása!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "Fedőréteg(ek)"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Térképfedőrétegek"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Hozza létre saját térképét"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Vissza"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Térkép területe"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Stílus"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Lap"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Beküldés"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Térképgenerálás"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Földrajzi terület"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Település keresése"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr "Fájl feltöltése"
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr "Fájlok feltöltése"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
@@ -1183,7 +1203,7 @@ msgstr ""
 "több fájlt is kijelölhet. Ha újra megnyitja a fájlkijelölő párbeszédpanelt, "
 "az új kijelölés felváltja az előzőt."
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
@@ -1193,11 +1213,11 @@ msgstr ""
 "a fájl segítségével létrehozott térkép <b>nyilvános</b> lesz.<br/><b>Ne "
 "töltsön fel</b> olyan adatot, amelyről nem szeretné, hogy bárki láthassa."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Földrajzi terület kijelölése"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1211,11 +1231,11 @@ msgstr ""
 "területet, jelölje ki a <em>Földrajzi terület</em> fület, és használja a kis "
 "térképet a megjelenítendő terület határainak beállításához."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Térkép elrendezése"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1225,11 +1245,11 @@ msgstr ""
 "névmutató. A <em>Többoldalas elrendezés</em> egy füzetet hoz létre, amely "
 "kinyomtatható és összefűzhető."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Térkép stíluslapja"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1238,11 +1258,11 @@ msgstr ""
 "térképnek a stílusa és megjelenése. A stíluslap azt is befolyásolja, hogy "
 "mely részletek lesznek láthatók a térképen."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Térképfedőrétegek"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1252,31 +1272,31 @@ msgstr ""
 "alapstíluson. Ha a térképen többfajta további információt is szeretne "
 "megjeleníteni, akkor több fedőréteget is kijelölhet."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Lap mérete"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr "(szélesség × magasság)"
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Hiba történt a kompatibilis lapméretek beolvasásakor."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "A térkép számára megfelelő lapméretek kiszámítása…"
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Lap formátuma és mérete"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "A térkép kívánt formátumának, méretének és tájolásának kijelölése."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
@@ -1285,55 +1305,55 @@ msgstr ""
 "térképterülethez legjobban illeszkedő méretből, vagy megadhatja az Ön által "
 "kiválasztott szélességet és magasságot."
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Térkép címe"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Nyelv"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "E-mail cím (értesítésekhez, nem kötelező)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr "törlődik ennyi idő után:"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr "óra"
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Összegzés"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Hely:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Elrendezés:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Stíluslap:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Fedőréteg:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Lapformátum:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Már majdnem kész!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1835,6 +1855,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "A javaslatok megjelenéséhez kezdjen el gépelni…"
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Földrajzi terület kijelölése"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Várakozás a megjelenítés elindulására…"
diff --git a/www/locale/id/LC_MESSAGES/django.po b/www/locale/id/LC_MESSAGES/django.po
index dec4be47..48e9d84a 100644
--- a/www/locale/id/LC_MESSAGES/django.po
+++ b/www/locale/id/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/maposmatic/"
@@ -645,7 +645,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -753,29 +753,29 @@ msgstr "Kotak batasan"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -1007,69 +1007,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1078,119 +1094,119 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 #, fuzzy
 #| msgid "Map title required"
 msgid "Map title"
 msgstr "Harus menggunakan judul peta"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1524,6 +1540,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
@@ -1673,6 +1701,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Proses render dibatalkan oleh user"
 
+#, fuzzy
+#~| msgid "The rendering was cancelled by the user."
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Proses render dibatalkan oleh user"
+
+#, fuzzy
+#~| msgid "The rendering was cancelled by the user."
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Proses render dibatalkan oleh user"
+
 #, fuzzy
 #~| msgid "The rendering was cancelled by the user."
 #~ msgid "Rendering started at %(date)s "
diff --git a/www/locale/it/LC_MESSAGES/django.po b/www/locale/it/LC_MESSAGES/django.po
index b0c6b3db..391f6245 100644
--- a/www/locale/it/LC_MESSAGES/django.po
+++ b/www/locale/it/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-05-07 10:44+0000\n"
 "Last-Translator: maurizio napolitano <napo@fbk.eu>\n"
 "Language-Team: Italian <http://translate.get-map.org/projects/maposmatic/"
@@ -753,7 +753,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Prossimo"
 
@@ -889,29 +889,29 @@ msgstr "Rettangolo di selezione"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Disposizione"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Stile"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Sovrapposizioni"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1137,60 +1137,80 @@ msgstr "Nessuna mappa coincide con la tua richiesta."
 msgid "Create a new map!"
 msgstr "Crea una nuova mappa!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "Sovrapposizioni"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Sovrapposizioni della mappa"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Genera la tua mappa"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Indietro"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Area della mappa"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Stile"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Carta"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Invia"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Genera"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Area geografica"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Ricerca città"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Umap data file"
 msgid "Upload files"
 msgstr "File dati Umap"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 #, fuzzy
 #| msgid ""
 #| "<b>Note:</b> The uploaded file will not be made available to anyone, the "
@@ -1205,11 +1225,11 @@ msgstr ""
 "mappa creata usando questo file <b>sarà visibile al pubblico</b>.<br/"
 "><b>NON</b> caricare dati che non si vuole siano pubblicamente visibili."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Selezione area geografica"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1223,11 +1243,11 @@ msgstr ""
 "di cui vuoi il rendering, seleziona la scheda <em>Area geografica</em> e usa "
 "la mini-mappa per impostare i limiti dell'area renderizzata."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Layout della mappa"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1237,11 +1257,11 @@ msgstr ""
 "rappresentati. Il <em>Layout multi-pagina</em> produce un opuscolo molto "
 "adatto per la stampa e la rilegatura."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Foglio di stile della mappa"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1250,11 +1270,11 @@ msgstr ""
 "noti che il foglio di stile determina anche quali dettagli saranno visibili "
 "sulla mappa."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Sovrapposizioni della mappa"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1264,87 +1284,87 @@ msgstr ""
 "selezionato. È possibile scegliere più sovrapposizioni per aggiungere "
 "diversi tipi di informazioni in cima alla mappa."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Dimensione carta"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 "Si è verificato un errore nell'ottenere le dimensioni carta compatibili."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "Calcolo dei formati di carta disponibili per la tua mappa..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formato e dimensioni carta"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 "Scegli il formato, dimensioni ed orientamento desiderati per la tua mappa."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Titolo della mappa"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Lingua"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "Il tuo indirizzo email (per notifiche, opzionale)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Sommario"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Località:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Disposizione:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Stile:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Sovrapposizione:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Formato carta:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Quasi finito!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1681,6 +1701,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Selezione area geografica"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "In attesa che inizi il rendering..."
@@ -1840,6 +1874,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Rendering fallito!"
 
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Rendering fallito!"
+
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Rendering fallito!"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Pagina singola senza indice delle vie"
 
diff --git a/www/locale/ja/LC_MESSAGES/django.po b/www/locale/ja/LC_MESSAGES/django.po
index f1e36a4a..f59fd95c 100644
--- a/www/locale/ja/LC_MESSAGES/django.po
+++ b/www/locale/ja/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-08-04 13:32+0000\n"
 "Last-Translator: zoar <k_zoar@k-side.net>\n"
 "Language-Team: Japanese <http://translate.get-map.org/projects/maposmatic/"
@@ -748,7 +748,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "次へ"
 
@@ -881,29 +881,29 @@ msgstr "領域選択"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "レイアウト"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "スタイルシート"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "オーバーレイ"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1129,60 +1129,80 @@ msgstr "検索に一致する地図はありませんでした。"
 msgid "Create a new map!"
 msgstr "新規地図が作成されました！"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "オーバーレイ"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "地図オーバーレイ"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "あなたの地図を作成する"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "戻る"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "地図の範囲"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "スタイル"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "用紙"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "確認"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "生成"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "地理的範囲"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "都市名の検索"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Umap data file"
 msgid "Upload files"
 msgstr "Umapデータファイル"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 #, fuzzy
 #| msgid ""
 #| "<b>Note:</b> The uploaded file will not be made available to anyone, the "
@@ -1197,11 +1217,11 @@ msgstr ""
 "使って作成された地図は<b>一般に公開されます</b>。<br/>公開したくないデータは"
 "アップロード<b>しない</b>でください。"
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "地理的範囲の選択"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1214,11 +1234,11 @@ msgstr ""
 "合や、自分でレンダリングの範囲を選択したい場合は <em>地理的範囲</em>タブを選"
 "択し、ミニマップを使ってレンダリングの範囲を設定できます。"
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "地図のレイアウト"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1227,11 +1247,11 @@ msgstr ""
 "地図のレイアウトでは地図と索引の描画方法を選択します。<em>複数ページレイアウ"
 "ト</em>では小冊子の印刷や製本に適したレイアウトで作成します。"
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "地図スタイルシート"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1239,11 +1259,11 @@ msgstr ""
 "地図スタイルシートでは地図自体の表示スタイルを決めます。スタイルによって地図"
 "上に表示される地物も決定されます。"
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "地図オーバーレイ"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1253,87 +1273,87 @@ msgstr ""
 "きます。地図上に様々な種類の追加情報を表示するために複数のオーバーレイ情報を"
 "選択できます。"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "用紙サイズ"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "適切な印刷紙サイズの呼び出しに失敗しました。"
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "地図を印刷するための用紙サイズを計算しています..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "印刷用紙のサイズと方向"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "印刷する用紙とサイズ、向きを選択してください。"
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "地図タイトル"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "地図の言語"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "あなたのメールアドレス(通知用オプション)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "選択した領域をクリア"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "概要"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "場所:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "レイアウト:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "スタイルシート:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "オーバーレイ:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "印刷紙形式:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "もうすぐです！"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1669,6 +1689,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "文字を入力すると内容提案が表示されます"
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "地理的範囲の選択"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "描画の開始を待っています…"
@@ -1824,6 +1858,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "レンダリングに失敗しました！"
 
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "レンダリングに失敗しました！"
+
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "レンダリングに失敗しました！"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "道路索引なしのフルページレイアウト"
 
diff --git a/www/locale/kk/LC_MESSAGES/django.po b/www/locale/kk/LC_MESSAGES/django.po
index fe4ce882..9ce79072 100644
--- a/www/locale/kk/LC_MESSAGES/django.po
+++ b/www/locale/kk/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.com/projects/p/maposmatic/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/kn_IN/LC_MESSAGES/django.po b/www/locale/kn_IN/LC_MESSAGES/django.po
index 9c90e7d4..6d2c9dfa 100644
--- a/www/locale/kn_IN/LC_MESSAGES/django.po
+++ b/www/locale/kn_IN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2014-01-07 10:20+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Kannada (India) (http://www.transifex.com/projects/p/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/ku_IQ/LC_MESSAGES/django.po b/www/locale/ku_IQ/LC_MESSAGES/django.po
index 0c9c63b2..f3fc777c 100644
--- a/www/locale/ku_IQ/LC_MESSAGES/django.po
+++ b/www/locale/ku_IQ/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2012-12-16 21:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/dittaeva/maposmatic/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/ky/LC_MESSAGES/django.po b/www/locale/ky/LC_MESSAGES/django.po
index 4292c7b9..8d2120b2 100644
--- a/www/locale/ky/LC_MESSAGES/django.po
+++ b/www/locale/ky/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Kirgyz (http://www.transifex.com/projects/p/maposmatic/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/ln/LC_MESSAGES/django.po b/www/locale/ln/LC_MESSAGES/django.po
index d6cf25b9..036cce5f 100644
--- a/www/locale/ln/LC_MESSAGES/django.po
+++ b/www/locale/ln/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 18:30+0000\n"
 "Last-Translator: E\n"
 "Language-Team: Lingala (http://www.transifex.com/dittaeva/maposmatic/"
@@ -640,7 +640,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -750,29 +750,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -992,71 +992,87 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 #, fuzzy
 #| msgid "German translation"
 msgid "Geographic area selection"
 msgstr "Bobóngolisi lialemani"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1065,117 +1081,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Ebandela"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1509,6 +1525,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "German translation"
+msgid "Remove selection"
+msgstr "Bobóngolisi lialemani"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/nb/LC_MESSAGES/django.po b/www/locale/nb/LC_MESSAGES/django.po
index b66b1202..e7909769 100644
--- a/www/locale/nb/LC_MESSAGES/django.po
+++ b/www/locale/nb/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/"
@@ -646,7 +646,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -754,29 +754,29 @@ msgstr "Avgrensingsboks"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -1000,69 +1000,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1071,119 +1087,119 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 #, fuzzy
 #| msgid "Map title required"
 msgid "Map title"
 msgstr "Tittel på kartet må oppgis"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1517,6 +1533,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/nl/LC_MESSAGES/django.po b/www/locale/nl/LC_MESSAGES/django.po
index 4d792d20..e1f4537c 100644
--- a/www/locale/nl/LC_MESSAGES/django.po
+++ b/www/locale/nl/LC_MESSAGES/django.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 14:45+0000\n"
 "Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/dittaeva/maposmatic/language/"
@@ -793,7 +793,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -964,22 +964,22 @@ msgstr "Selectiekader"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Indeling."
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Stijlblad"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -988,7 +988,7 @@ msgstr "Kaartdetails"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1234,77 +1234,97 @@ msgstr "Geen kaart voldoet aan uw vraag."
 msgid "Create a new map!"
 msgstr "Maak nieuwe kaart!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Kaartdetails"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Kaartdetails"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Genereer uw eigen kaart"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Kaart-taal"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Stijlblad"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Papiergrootte"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Genereer"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Geografisch gebied"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Zoek stad"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Kaartdetails"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Geografisch gebied-selectie"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1327,13 +1347,13 @@ msgstr ""
 "<em>Geografisch gebied</em>-tab en gebruik de mini-kaart om de grenzen van "
 "het verwerkte gebied te kiezen."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Lay-out met meerdere pagina's"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1355,13 +1375,13 @@ msgstr ""
 "zelf. Let er op dat het stijlblad ook bepaald welke details op een kaart "
 "zichtbaar zullen zijn."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Stijlblad"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1382,32 +1402,32 @@ msgstr ""
 "zelf. Let er op dat het stijlblad ook bepaald welke details op een kaart "
 "zichtbaar zullen zijn."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Kaartdetails"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Papiergrootte"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Een probleem deed zich voor tijdens het ophalen van de papierformaten."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1417,75 +1437,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Bereken beschikbare "
 "papierformaten voor uw kaart..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Papierformaat en -grootte"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Kies het gewenste formaat, grootte en oriëntate voor uw kaart."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Kaarttitel"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Kaart-taal"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Wis geselecteerd gebied"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Locatie:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Indeling:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Stijlblad:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Kaartdetails"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Papierformaat:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Bijna klaar!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1826,6 +1846,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Begin met typen voor suggesties..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Geografisch gebied-selectie"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Wachten tot reproductie start..."
@@ -1989,6 +2023,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Reproductie-daemon:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Reproductie-daemon:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Reproductie-daemon:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Lay-out met volledige paginabreedte, zonder straatnamenindex"
 
diff --git a/www/locale/nn/LC_MESSAGES/django.po b/www/locale/nn/LC_MESSAGES/django.po
index c743896a..d2ea7e74 100644
--- a/www/locale/nn/LC_MESSAGES/django.po
+++ b/www/locale/nn/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/pl/LC_MESSAGES/django.po b/www/locale/pl/LC_MESSAGES/django.po
index cf9a2ef2..4409c172 100644
--- a/www/locale/pl/LC_MESSAGES/django.po
+++ b/www/locale/pl/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 14:39+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/dittaeva/maposmatic/language/"
@@ -667,7 +667,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -777,15 +777,15 @@ msgstr "Obszar"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Styl"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 #, fuzzy
 #| msgid "Map title"
 msgid "Stylesheet"
@@ -793,8 +793,8 @@ msgstr "Nazwa mapy"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -803,7 +803,7 @@ msgstr "Szczegóły mapy"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1053,75 +1053,95 @@ msgstr ""
 msgid "Create a new map!"
 msgstr "Stwórz nową mapę!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Szczegóły mapy"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Szczegóły mapy"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Wygeneruj własną mapę"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Ustawienia regionalne mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Rozmiar papieru"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Stwórz mapę"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Obszar geograficzny"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Wyszukiwanie miasta"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Szczegóły mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Zaznaczenie obszaru geograficznego"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1130,133 +1150,133 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Układ na wiele stron"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Map title"
 msgid "Map stylesheet"
 msgstr "Nazwa mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Szczegóły mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Rozmiar papieru"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 #, fuzzy
 #| msgid "Paper format"
 msgid "Paper format and size"
 msgstr "Format arkusza"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Nazwa mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Ustawienia regionalne mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Wyczyść zaznaczony obszar"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Lokalizacja:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Styl"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 #, fuzzy
 #| msgid "Map title"
 msgid "Stylesheet:"
 msgstr "Nazwa mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Szczegóły mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Format arkusza"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Prawie gotowe!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1590,6 +1610,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Zacznij pisać a zobaczysz sugestie.."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Zaznaczenie obszaru geograficznego"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Czekanie na rozpoczecie renderowania.."
@@ -1751,6 +1785,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Deamon renderujący:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Deamon renderujący:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Deamon renderujący:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Układ pełnej strony bez indeksu ulic"
 
diff --git a/www/locale/pt/LC_MESSAGES/django.po b/www/locale/pt/LC_MESSAGES/django.po
index bb9e99e2..de29f044 100644
--- a/www/locale/pt/LC_MESSAGES/django.po
+++ b/www/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2012-12-16 21:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (http://www.transifex.com/dittaeva/maposmatic/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/pt_BR/LC_MESSAGES/django.po b/www/locale/pt_BR/LC_MESSAGES/django.po
index c39c9943..2c3ef309 100644
--- a/www/locale/pt_BR/LC_MESSAGES/django.po
+++ b/www/locale/pt_BR/LC_MESSAGES/django.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2021-12-27 00:34+0000\n"
 "Last-Translator: André Marcelo Alvarenga <andrealvarenga@gmx.net>\n"
 "Language-Team: Portuguese (Brazil) <https://translate.get-map.org/projects/"
@@ -788,7 +788,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -944,22 +944,22 @@ msgstr "Área"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Layout"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Folha de estilo"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -968,7 +968,7 @@ msgstr "Detalhes do mapa"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1214,77 +1214,97 @@ msgstr "Nenhum mapa corresponde à sua pesquisa."
 msgid "Create a new map!"
 msgstr "Criar um novo mapa!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Detalhes do mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Detalhes do mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Gere seu próprio mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Idioma do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Folha de estilo"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Tamanho do papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Gerar"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Área geográfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Buscar cidade"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Detalhes do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Seleção de área geográfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1308,13 +1328,13 @@ msgstr ""
 "selecione a aba <em>Área Geográfica</em> e use o mini-mapa para\n"
 "escolher os limites da área a renderizar."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Layout de múltiplas páginas"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1339,13 +1359,13 @@ msgstr ""
 "ficarão\n"
 "visíveis no mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Folha de estilo"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1369,32 +1389,32 @@ msgstr ""
 "ficarão\n"
 "visíveis no mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Detalhes do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Tamanho do papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Ocorreu um erro ao obter os tamanhos de papel compatíveis."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1404,75 +1424,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Calculando os formatos de "
 "papel disponíveis para o seu mapa..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formato e tamanho do papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Selecione o formato, tamanho e orientação desejados para o seu mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Título do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Idioma do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Limpar seleção"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Sumário"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Localização:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Layout:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Folha de estilo:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Detalhes do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Formato do papel:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Quase lá!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1813,6 +1833,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Digite algo para receber sugestões..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Seleção de área geográfica"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Aguardando a renderização iniciar..."
@@ -1974,6 +2008,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Processo de renderização:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Processo de renderização:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Processo de renderização:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Layout de página inteira sem índice de ruas"
 
diff --git a/www/locale/pt_PT/LC_MESSAGES/django.po b/www/locale/pt_PT/LC_MESSAGES/django.po
index ae67843a..c94e184c 100644
--- a/www/locale/pt_PT/LC_MESSAGES/django.po
+++ b/www/locale/pt_PT/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 14:46+0000\n"
 "Last-Translator: Rui <xymarior@yandex.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/dittaeva/"
@@ -803,7 +803,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -972,22 +972,22 @@ msgstr "Área de limites"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Esquema de página"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Folha de estilo"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -996,7 +996,7 @@ msgstr "Detalhes do mapa"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1242,77 +1242,97 @@ msgstr "Não foi encontrado nenhum mapa com os termos pesquisados."
 msgid "Create a new map!"
 msgstr "Criar um novo mapa!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Detalhes do mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Detalhes do mapa"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Criar um mapa personalizado"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "Idioma do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "Folha de estilo"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Tamanho do papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Gerar"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Área geográfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Procurar cidade"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Detalhes do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Seleção de área geográfica"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1335,13 +1355,13 @@ msgstr ""
 "a área exata a renderizar, selecione a aba <em>Área Geográfica</em>\n"
 "e use o mini-mapa para escolher os limites da área a renderizar."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Várias páginas"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1366,13 +1386,13 @@ msgstr ""
 "serão\n"
 "visíveis no mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "Folha de estilo"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1396,32 +1416,32 @@ msgstr ""
 "serão\n"
 "visíveis no mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Detalhes do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Tamanho do papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Ocorreu um erro ao processar os tamanhos de papel compatíveis."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1431,75 +1451,75 @@ msgstr ""
 "<i class=\"glyphicon glyphicon-refresh\"></i> Calculando os formatos de "
 "papel disponíveis para o seu mapa..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formato e tamanho do papel"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Selecione o formato, tamanho e orientação desejados para o seu mapa."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Título do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "Idioma do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Limpar a área selecionada"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Sumário"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Localização:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Esquema de página:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Folha de estilos:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Detalhes do mapa"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Formato do papel:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Quase lá!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1840,6 +1860,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Comece a escrever para ver sugestões..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Seleção de área geográfica"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "A aguardar o início da renderização..."
@@ -2003,6 +2037,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Processo de renderização:"
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Processo de renderização:"
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Processo de renderização:"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Página inteira sem índice de ruas"
 
diff --git a/www/locale/rm/LC_MESSAGES/django.po b/www/locale/rm/LC_MESSAGES/django.po
index 1dc11596..01b43e66 100644
--- a/www/locale/rm/LC_MESSAGES/django.po
+++ b/www/locale/rm/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2012-12-16 21:31+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romansh (http://www.transifex.com/dittaeva/maposmatic/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/ro_RO/LC_MESSAGES/django.po b/www/locale/ro_RO/LC_MESSAGES/django.po
index 6f1eae1a..4ae10cd7 100644
--- a/www/locale/ro_RO/LC_MESSAGES/django.po
+++ b/www/locale/ro_RO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-08-11 12:22+0000\n"
 "Last-Translator: Dragos C <gisbihor@gmail.com>\n"
 "Language-Team: Romanian <http://translate.get-map.org/projects/maposmatic/"
@@ -642,7 +642,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -754,8 +754,8 @@ msgstr "Casetă de încadrare"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 #, fuzzy
 #| msgid "Layout:"
 msgid "Layout"
@@ -764,21 +764,21 @@ msgstr "Pe pagina..."
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Suprapunerile"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -998,69 +998,87 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Search for a map"
+msgid "Search overlay"
+msgstr "Caută o harta"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Cauta oras"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1069,119 +1087,119 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 #, fuzzy
 #| msgid "Paper format"
 msgid "Paper format and size"
 msgstr "Format hartie"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Pe pagina..."
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Format hartie"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1515,6 +1533,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/ru/LC_MESSAGES/django.po b/www/locale/ru/LC_MESSAGES/django.po
index 8a778d26..f5987bc9 100644
--- a/www/locale/ru/LC_MESSAGES/django.po
+++ b/www/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-04-13 10:52+0000\n"
 "Last-Translator: Nikolay Parukhin <parukhin@gmail.com>\n"
 "Language-Team: Russian <http://translate.get-map.org/projects/maposmatic/"
@@ -773,7 +773,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Вперёд"
 
@@ -908,29 +908,29 @@ msgstr "Прямоугольная область"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Макет"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Таблица стилей"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Слои"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1157,60 +1157,80 @@ msgstr "Нет карт, удовлетворяющих условиям ваш
 msgid "Create a new map!"
 msgstr "Создать новую карту!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "Слой(и)"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Слои карты"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Сгенерировать вашу собственную карту"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Назад"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Область карты"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Стиль"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Бумага"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Отправить"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Создать"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Географическая область"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Поиск города"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Umap data file"
 msgid "Upload files"
 msgstr "Файл данных Umap"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 #, fuzzy
 #| msgid ""
 #| "<b>Note:</b> The uploaded file will not be made available to anyone, the "
@@ -1226,11 +1246,11 @@ msgstr ""
 "><b>НЕ</b> загружайте какие-либо данные, которые вы не хотите показывать "
 "всем пользователям."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Выбор географической области"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1246,11 +1266,11 @@ msgstr ""
 "выберите вкладку <em> Географическая область</em> и используйте мини-карту \n"
 "для задания границ области отрисовки."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Макет карты"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1260,11 +1280,11 @@ msgstr ""
 "нескольких страницах</em> производит буклет очень подходящий для печати и "
 "переплета."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Таблица стилей карты"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1273,11 +1293,11 @@ msgstr ""
 "внимание, что таблица стилей также определяет то, какие данные будут видны "
 "на карте."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Слои карты"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1287,87 +1307,87 @@ msgstr ""
 "Можно выбрать несколько слоёв, чтобы добавить различные виды дополнительной "
 "информации поверх карты."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Размер бумаги"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Возникла ошибка при получении совместимых размеров бумаги."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "Вычисление доступных форматов бумаги для вашей карты..."
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Формат и размер бумаги"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Выберите нужный формат, размер и ориентацию карты."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Заголовок карты"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Язык"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "Ваш адрес электронной почты (для уведомлений, необязательно)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Очистить выбранную область"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Итог"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Расположение:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Макет:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Таблица стилей:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Слой:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Формат бумаги:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Почти готово!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1703,6 +1723,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Начните печатать для подсказок..."
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Выбор географической области"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Ожидает отрисовки..."
@@ -1858,6 +1892,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Сбой отрисовки!"
 
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Сбой отрисовки!"
+
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Сбой отрисовки!"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Карта на одном листе без перечня улиц"
 
diff --git a/www/locale/sk/LC_MESSAGES/django.po b/www/locale/sk/LC_MESSAGES/django.po
index 1eb76af0..ba806470 100644
--- a/www/locale/sk/LC_MESSAGES/django.po
+++ b/www/locale/sk/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-07-09 06:30+0000\n"
 "Last-Translator: Jose Riha <jose1711@gmail.com>\n"
 "Language-Team: Slovak <http://translate.get-map.org/projects/maposmatic/"
@@ -664,7 +664,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Ďalej"
 
@@ -782,29 +782,29 @@ msgstr "Ohraničujúci rámček"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Rozloženie"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Kaskádový štýl"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Doplnky"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -1026,69 +1026,89 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Choose overlay(s)"
+msgstr "Doplnky mapy"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Doplnky mapy"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Vytvoriť vlastnú mapu"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Oblasť na mape"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Papier"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Odoslať"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Zemepisná oblasť"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Vyhľadanie mesta"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Výber zemepisnej oblasti"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1097,117 +1117,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Doplnky mapy"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Veľkost papiera"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Formát a veľkosť papiera"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Vyberte požadovaný formát, veľkosť a orientáciu mapy."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Formát papiera:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1541,6 +1561,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Výber zemepisnej oblasti"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/sv_SE/LC_MESSAGES/django.po b/www/locale/sv_SE/LC_MESSAGES/django.po
index 238c6262..024d6d3a 100644
--- a/www/locale/sv_SE/LC_MESSAGES/django.po
+++ b/www/locale/sv_SE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 22:20+0000\n"
 "Last-Translator: Christian B\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/dittaeva/"
@@ -664,7 +664,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -776,15 +776,15 @@ msgstr "Begränsningsruta"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 #, fuzzy
 #| msgid "Map title"
 msgid "Stylesheet"
@@ -792,8 +792,8 @@ msgstr "Karttitel"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -802,7 +802,7 @@ msgstr "Kartdetaljer"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1052,81 +1052,101 @@ msgstr ""
 msgid "Create a new map!"
 msgstr "Skapa en ny karta!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "Kartdetaljer"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "Kartdetaljer"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Skapa din egen karta"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map details"
 msgid "Map area"
 msgstr "Kartdetaljer"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Pappersstorlek"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 #, fuzzy
 #| msgid "Create map"
 msgid "Generate"
 msgstr "Skapa karta"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 #, fuzzy
 #| msgid "Map details"
 msgid "Geographic area"
 msgstr "Kartdetaljer"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "Kartdetaljer"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 #, fuzzy
 #| msgid "German translation"
 msgid "Geographic area selection"
 msgstr "Tysk översättning"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1135,131 +1155,131 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Map details"
 msgid "Map layout"
 msgstr "Kartdetaljer"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Map title"
 msgid "Map stylesheet"
 msgstr "Karttitel"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "Kartdetaljer"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Pappersstorlek"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 #, fuzzy
 #| msgid "Paper format:"
 msgid "Paper format and size"
 msgstr "Pappersformat:"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Karttitel"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map details"
 msgid "Locale"
 msgstr "Kartdetaljer"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Summering"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Läge:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 #, fuzzy
 #| msgid "Map title"
 msgid "Stylesheet:"
 msgstr "Karttitel"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "Kartdetaljer"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Pappersformat:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Nästan där!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1593,6 +1613,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "German translation"
+msgid "Remove selection"
+msgstr "Tysk översättning"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
@@ -1742,6 +1776,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Renderar..."
 
+#, fuzzy
+#~| msgid "Rendering..."
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Renderar..."
+
+#, fuzzy
+#~| msgid "Rendering..."
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Renderar..."
+
 #, fuzzy
 #~| msgid "Rendering..."
 #~ msgid "Rendering started at %(date)s "
diff --git a/www/locale/tr/LC_MESSAGES/django.po b/www/locale/tr/LC_MESSAGES/django.po
index 7d0c19ee..03146eea 100644
--- a/www/locale/tr/LC_MESSAGES/django.po
+++ b/www/locale/tr/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2017-09-19 14:39+0000\n"
 "Last-Translator: Mehmet Burak Mutluay <mburakmutluay@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/dittaeva/maposmatic/"
@@ -662,7 +662,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -772,8 +772,8 @@ msgstr "Sınırlayıcı çerçeve"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Layout"
@@ -782,7 +782,7 @@ msgstr "Çoklu sayfa düzeni"
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 #, fuzzy
 #| msgid "Map title"
 msgid "Stylesheet"
@@ -790,15 +790,15 @@ msgstr "Harita başlığı"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -1052,73 +1052,93 @@ msgstr ""
 msgid "Create a new map!"
 msgstr "Haritayı yenile"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Multi-page layout"
+msgid "Choose overlay(s)"
+msgstr "Çoklu sayfa düzeni"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Multi-page layout"
+msgid "Search overlay"
+msgstr "Çoklu sayfa düzeni"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "Kağıt boyutu"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 #, fuzzy
 #| msgid "German translation"
 msgid "Geographic area selection"
 msgstr "almanca tercüme"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1127,131 +1147,131 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "Çoklu sayfa düzeni"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Map title"
 msgid "Map stylesheet"
 msgstr "Harita başlığı"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map overlays"
 msgstr "Çoklu sayfa düzeni"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Kağıt boyutu"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper format and size"
 msgstr "Kağıt boyutu"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Harita başlığı"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map title"
 msgid "Locale"
 msgstr "Harita başlığı"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Özet"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 #, fuzzy
 #| msgid "Map title"
 msgid "Stylesheet:"
 msgstr "Harita başlığı"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 #, fuzzy
 #| msgid "Paper orientation"
 msgid "Paper format:"
 msgstr "Kağıt yönü"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1585,6 +1605,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "German translation"
+msgid "Remove selection"
+msgstr "almanca tercüme"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "İşlenmenin başlaması bekliniyor..."
@@ -1743,6 +1777,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "İşlenme başarılı"
 
+#, fuzzy
+#~| msgid "Rendering was successful."
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "İşlenme başarılı"
+
+#, fuzzy
+#~| msgid "Rendering was successful."
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "İşlenme başarılı"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Sokaklar olmadan tam sayfa düzeni"
 
diff --git a/www/locale/uk/LC_MESSAGES/django.po b/www/locale/uk/LC_MESSAGES/django.po
index 8f3bd78b..e574f1b3 100644
--- a/www/locale/uk/LC_MESSAGES/django.po
+++ b/www/locale/uk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2019-04-16 19:13+0000\n"
 "Last-Translator: Serhij Dubyk <dubyk@ukr.net>\n"
 "Language-Team: Ukrainian <http://translate.get-map.org/projects/maposmatic/"
@@ -772,7 +772,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr "Далі"
 
@@ -911,29 +911,29 @@ msgstr "Обмежувальна рамка"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "Макет сторінки"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "Стиль"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr "Шари"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1159,60 +1159,80 @@ msgstr "Немає мап, що задовольняють умовам вашо
 msgid "Create a new map!"
 msgstr "Створити нову мапу!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Overlay(s)"
+msgid "Choose overlay(s)"
+msgstr "Шар(и)"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map overlays"
+msgid "Search overlay"
+msgstr "Шари мапи"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "Створення Вашої власної мапи"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr "Назад"
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr "Ділянка мапи"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr "Стиль"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr "Папір"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr "Подати"
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "Створити мапу"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "Географічна область"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "Пошук міста"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Umap data file"
 msgid "Upload files"
 msgstr "Файл даних Umap"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 #, fuzzy
 #| msgid ""
 #| "<b>Note:</b> The uploaded file will not be made available to anyone, the "
@@ -1228,11 +1248,11 @@ msgstr ""
 "><b>НЕ</b> завантажуйте будь-які дані, які Ви не хочете показувати усім "
 "користувачам."
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "Виділення географічної області"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1247,11 +1267,11 @@ msgstr ""
 " виберіть вкладку <em>Географічна область</em> та використовуйте міні-мапу,  "
 "щоб задати межі необхідної області."
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr "Макет мапи"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
@@ -1261,11 +1281,11 @@ msgstr ""
 " <em>Макет мапи на декількох сторінках</em> створює буклет,\n"
 " який підходить для друку та переплетення."
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr "Таблиця стилів мапи"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
@@ -1273,11 +1293,11 @@ msgstr ""
 "Таблиця стилів мапи визначає стиль та зовнішній вигляд самої мапи.  Зверніть "
 "увагу, що таблиця стилів також визначає, які деталі будуть видимі на мапі."
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr "Шари мапи"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
@@ -1287,87 +1307,87 @@ msgstr ""
 "вибрати кілька шарів, щоб додати різні види додаткової інформації поверх "
 "мапи."
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "Розмір паперу"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "Сталася помилка при пошуку відповідних розмірів паперу."
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr "Визначення доступних форматів паперу для Вашої мапи…"
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "Формат та розмір паперу"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "Виберіть бажаний формат, розмір і орієнтацію для Вашої мапи."
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "Назва мапи"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr "Мова"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr "Ваша адресу електронної пошти (для повідомлень, необовʼязково)"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "Очистити виділену область"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr "Зведення"
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "Розташування:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "Макет:"
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "Стиль:"
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr "Шар:"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "Формат паперу:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "Майже готово!"
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1704,6 +1724,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "Почніть набирати, щоб побачити наявні міста…"
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "Виділення географічної області"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "Запит на створення мапи доданий в чергу…"
@@ -1862,6 +1896,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "Збій рушія промальовки мапи!"
 
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "Збій рушія промальовки мапи!"
+
+#, fuzzy
+#~| msgid "Rendering failed!"
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "Збій рушія промальовки мапи!"
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "Мапа на одному аркуші без переліку вулиць"
 
diff --git a/www/locale/vi/LC_MESSAGES/django.po b/www/locale/vi/LC_MESSAGES/django.po
index 8b3420e8..80f3d33e 100644
--- a/www/locale/vi/LC_MESSAGES/django.po
+++ b/www/locale/vi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2013-11-20 12:37+0000\n"
 "Last-Translator: Hakan Tandogan <hakan.tandogan@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/maposmatic/"
@@ -631,7 +631,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -739,29 +739,29 @@ msgstr ""
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 msgid "Overlays"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 msgid "Indexer"
 msgstr ""
 
@@ -981,69 +981,85 @@ msgstr ""
 msgid "Create a new map!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+msgid "Choose overlay(s)"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+msgid "Search overlay"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 msgid "Map area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 msgid "Style"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 msgid "Paper"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 msgid "Upload files"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 msgid ""
 "Start by choosing the city or geographic area you want to render. "
 "Suggestions will appear as you start typing. If you can't find the city you "
@@ -1052,117 +1068,117 @@ msgid ""
 "limits of the rendered area."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 msgid "Map layout"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 msgid ""
 "The map layout determines how the map and the index are rendered. The "
 "<em>Multi-page layout</em> produces a booklet very suitable for printing and "
 "binding."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 msgid "Map stylesheet"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 msgid ""
 "The map stylesheet determines the style and appearance of the map itself. "
 "Note that the stylesheet also drives what details will be visible on the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 msgid "Map overlays"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 msgid "Calculating available paper formats for your map..."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 msgid "Locale"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "will be deleted after"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 msgid "Overlay:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 msgid ""
 "You're almost ready to request to map rendering! Select the map language, "
 "eventually adjust the title of your map, and you're good to go!"
@@ -1496,6 +1512,18 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr ""
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+msgid "Remove selection"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr ""
diff --git a/www/locale/zh_TW/LC_MESSAGES/django.po b/www/locale/zh_TW/LC_MESSAGES/django.po
index 89133d2b..1991c6dd 100644
--- a/www/locale/zh_TW/LC_MESSAGES/django.po
+++ b/www/locale/zh_TW/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MapOSMatic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-06 13:14+0100\n"
+"POT-Creation-Date: 2022-11-06 13:18+0100\n"
 "PO-Revision-Date: 2015-04-09 20:28+0800\n"
 "Last-Translator: Jacky Liu <jjkka.132@gmail.com>\n"
 "Language: zh-tw\n"
@@ -761,7 +761,7 @@ msgid "Previous"
 msgstr ""
 
 #: www/maposmatic/templates/maposmatic/index-parts/carousel.html:51
-#: www/maposmatic/templates/maposmatic/new.html:146
+#: www/maposmatic/templates/maposmatic/new.html:150
 msgid "Next"
 msgstr ""
 
@@ -926,22 +926,22 @@ msgstr "方框"
 #: www/maposmatic/templates/maposmatic/map-feed.html:22
 #: www/maposmatic/templates/maposmatic/map-full.html:80
 #: www/maposmatic/templates/maposmatic/maps.html:74
-#: www/maposmatic/templates/maposmatic/new.html:121
-#: www/maposmatic/templates/maposmatic/new.html:247
+#: www/maposmatic/templates/maposmatic/new.html:125
+#: www/maposmatic/templates/maposmatic/new.html:251
 msgid "Layout"
 msgstr "輸出"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:24
 #: www/maposmatic/templates/maposmatic/map-full.html:82
 #: www/maposmatic/templates/maposmatic/maps.html:75
-#: www/maposmatic/templates/maposmatic/new.html:285
+#: www/maposmatic/templates/maposmatic/new.html:289
 msgid "Stylesheet"
 msgstr "樣式表"
 
 #: www/maposmatic/templates/maposmatic/map-feed.html:27
 #: www/maposmatic/templates/maposmatic/map-full.html:85
-#: www/maposmatic/templates/maposmatic/new.html:131
-#: www/maposmatic/templates/maposmatic/new.html:314
+#: www/maposmatic/templates/maposmatic/new.html:135
+#: www/maposmatic/templates/maposmatic/new.html:318
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlays"
@@ -950,7 +950,7 @@ msgstr "地圖詳細資料"
 #: www/maposmatic/templates/maposmatic/map-feed.html:31
 #: www/maposmatic/templates/maposmatic/map-full.html:89
 #: www/maposmatic/templates/maposmatic/maps.html:80
-#: www/maposmatic/templates/maposmatic/new.html:251
+#: www/maposmatic/templates/maposmatic/new.html:255
 #, fuzzy
 #| msgid "index"
 msgid "Indexer"
@@ -1196,77 +1196,97 @@ msgstr "沒有與您要求相符之地圖"
 msgid "Create a new map!"
 msgstr "建立新地圖!"
 
-#: www/maposmatic/templates/maposmatic/new.html:103
+#: www/maposmatic/templates/maposmatic/new.html:41
+#, fuzzy
+#| msgid "Map details"
+msgid "Choose overlay(s)"
+msgstr "地圖詳細資料"
+
+#: www/maposmatic/templates/maposmatic/new.html:42
+#, fuzzy
+#| msgid "Map details"
+msgid "Search overlay"
+msgstr "地圖詳細資料"
+
+#: www/maposmatic/templates/maposmatic/new.html:43
+msgid "No results"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:44
+msgid "Add"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/new.html:107
 msgid "Generate your own map"
 msgstr "產生您自己的地圖"
 
-#: www/maposmatic/templates/maposmatic/new.html:109
+#: www/maposmatic/templates/maposmatic/new.html:113
 msgid "Back"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:116
+#: www/maposmatic/templates/maposmatic/new.html:120
 #, fuzzy
 #| msgid "Map locale"
 msgid "Map area"
 msgstr "地圖語言"
 
-#: www/maposmatic/templates/maposmatic/new.html:126
+#: www/maposmatic/templates/maposmatic/new.html:130
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Style"
 msgstr "樣式表"
 
-#: www/maposmatic/templates/maposmatic/new.html:136
+#: www/maposmatic/templates/maposmatic/new.html:140
 #, fuzzy
 #| msgid "Paper size"
 msgid "Paper"
 msgstr "紙張大小"
 
-#: www/maposmatic/templates/maposmatic/new.html:141
+#: www/maposmatic/templates/maposmatic/new.html:145
 msgid "Submit"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:148
+#: www/maposmatic/templates/maposmatic/new.html:152
 msgid "Generate"
 msgstr "產生"
 
-#: www/maposmatic/templates/maposmatic/new.html:162
+#: www/maposmatic/templates/maposmatic/new.html:166
 msgid "Geographic area"
 msgstr "地理區域"
 
-#: www/maposmatic/templates/maposmatic/new.html:165
+#: www/maposmatic/templates/maposmatic/new.html:169
 msgid "City search"
 msgstr "搜尋城市"
 
-#: www/maposmatic/templates/maposmatic/new.html:168
+#: www/maposmatic/templates/maposmatic/new.html:172
 msgid "File upload"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:195
+#: www/maposmatic/templates/maposmatic/new.html:199
 #, fuzzy
 #| msgid "Map details"
 msgid "Upload files"
 msgstr "地圖詳細資料"
 
-#: www/maposmatic/templates/maposmatic/new.html:204
+#: www/maposmatic/templates/maposmatic/new.html:208
 msgid ""
 "Upload GPX, Umap, or general GeoJSON files here. <br/> You can select "
 "multiple files at once. If you re-open the file selection dialog to select "
 "files, your selection will replace the previous one."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:216
+#: www/maposmatic/templates/maposmatic/new.html:220
 msgid ""
 "<b>Note:</b> The uploaded files will not be made available to anyone, the "
 "map created using this file <b>will be publicly visible</b> though.<br/>Do "
 "<b>NOT</b> upload any data you don't want to be publicly visible."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:228
+#: www/maposmatic/templates/maposmatic/new.html:232
 msgid "Geographic area selection"
 msgstr "地理區域選擇"
 
-#: www/maposmatic/templates/maposmatic/new.html:230
+#: www/maposmatic/templates/maposmatic/new.html:234
 #, fuzzy
 #| msgid ""
 #| "Start by choosing the city or geographic area you want to\n"
@@ -1287,13 +1307,13 @@ msgstr ""
 "城市，或您欲精確選擇繪圖位置，請點選 <em>地理區域</em> 標籤並利用「小地圖」設"
 "定繪製區域。"
 
-#: www/maposmatic/templates/maposmatic/new.html:266
+#: www/maposmatic/templates/maposmatic/new.html:270
 #, fuzzy
 #| msgid "Multi-page layout"
 msgid "Map layout"
 msgstr "多頁輸出"
 
-#: www/maposmatic/templates/maposmatic/new.html:268
+#: www/maposmatic/templates/maposmatic/new.html:272
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1313,13 +1333,13 @@ msgstr ""
 "<em>多頁輸出</em> 產生適合印出裝釘的小冊子、地圖樣式決定地圖的外觀\n"
 "。（注意：樣式表會改變地圖上顯示的細節資訊）"
 
-#: www/maposmatic/templates/maposmatic/new.html:297
+#: www/maposmatic/templates/maposmatic/new.html:301
 #, fuzzy
 #| msgid "Stylesheet"
 msgid "Map stylesheet"
 msgstr "樣式表"
 
-#: www/maposmatic/templates/maposmatic/new.html:299
+#: www/maposmatic/templates/maposmatic/new.html:303
 #, fuzzy
 #| msgid ""
 #| "The map layout determines how the map and the index are\n"
@@ -1338,32 +1358,32 @@ msgstr ""
 "<em>多頁輸出</em> 產生適合印出裝釘的小冊子、地圖樣式決定地圖的外觀\n"
 "。（注意：樣式表會改變地圖上顯示的細節資訊）"
 
-#: www/maposmatic/templates/maposmatic/new.html:326
+#: www/maposmatic/templates/maposmatic/new.html:330
 #, fuzzy
 #| msgid "Map details"
 msgid "Map overlays"
 msgstr "地圖詳細資料"
 
-#: www/maposmatic/templates/maposmatic/new.html:328
+#: www/maposmatic/templates/maposmatic/new.html:332
 msgid ""
 "Overlays render extra objects on top of the chosen base style. Multiple "
 "overlays can be selected to add different kinds of additional information on "
 "top of the map."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "Paper size"
 msgstr "紙張大小"
 
-#: www/maposmatic/templates/maposmatic/new.html:344
+#: www/maposmatic/templates/maposmatic/new.html:348
 msgid "(width x height)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:377
+#: www/maposmatic/templates/maposmatic/new.html:381
 msgid "An error occured while retrieving compatible paper sizes."
 msgstr "在找尋適合紙張大小時發生錯誤"
 
-#: www/maposmatic/templates/maposmatic/new.html:386
+#: www/maposmatic/templates/maposmatic/new.html:390
 #, fuzzy
 #| msgid ""
 #| "<i class=\"glyphicon glyphicon-refresh\"></i> Calculating available paper "
@@ -1372,75 +1392,75 @@ msgid "Calculating available paper formats for your map..."
 msgstr ""
 " <i class=\"glyphicon glyphicon-refresh\"></i> 正在為您計算可用的紙張格式…"
 
-#: www/maposmatic/templates/maposmatic/new.html:394
+#: www/maposmatic/templates/maposmatic/new.html:398
 msgid "Paper format and size"
 msgstr "紙張格式與大小"
 
-#: www/maposmatic/templates/maposmatic/new.html:396
+#: www/maposmatic/templates/maposmatic/new.html:400
 msgid "Select the desired format, size and orientation for your map."
 msgstr "選擇您地圖的格式、大小與紙張方向"
 
-#: www/maposmatic/templates/maposmatic/new.html:399
+#: www/maposmatic/templates/maposmatic/new.html:403
 msgid ""
 "You can choose from the suggested standard sizes, the \"best fit\" size for "
 "the map area you selected, or specify a width and height of your own choice."
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:415
+#: www/maposmatic/templates/maposmatic/new.html:419
 msgid "Map title"
 msgstr "地圖標題"
 
-#: www/maposmatic/templates/maposmatic/new.html:421
+#: www/maposmatic/templates/maposmatic/new.html:425
 #, fuzzy
 #| msgid "Map locale"
 msgid "Locale"
 msgstr "地圖語言"
 
-#: www/maposmatic/templates/maposmatic/new.html:440
+#: www/maposmatic/templates/maposmatic/new.html:444
 msgid "Your Email address (for notifications, optional)"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 #, fuzzy
 #| msgid "Clear selected area"
 msgid "will be deleted after"
 msgstr "清除所選區域"
 
-#: www/maposmatic/templates/maposmatic/new.html:443
+#: www/maposmatic/templates/maposmatic/new.html:447
 msgid "hours"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:452
+#: www/maposmatic/templates/maposmatic/new.html:456
 msgid "Summary"
 msgstr ""
 
-#: www/maposmatic/templates/maposmatic/new.html:455
+#: www/maposmatic/templates/maposmatic/new.html:459
 msgid "Location:"
 msgstr "地點:"
 
-#: www/maposmatic/templates/maposmatic/new.html:456
+#: www/maposmatic/templates/maposmatic/new.html:460
 msgid "Layout:"
 msgstr "輸出: "
 
-#: www/maposmatic/templates/maposmatic/new.html:457
+#: www/maposmatic/templates/maposmatic/new.html:461
 msgid "Stylesheet:"
 msgstr "樣式表: "
 
-#: www/maposmatic/templates/maposmatic/new.html:458
+#: www/maposmatic/templates/maposmatic/new.html:462
 #, fuzzy
 #| msgid "Map details"
 msgid "Overlay:"
 msgstr "地圖詳細資料"
 
-#: www/maposmatic/templates/maposmatic/new.html:459
+#: www/maposmatic/templates/maposmatic/new.html:463
 msgid "Paper format:"
 msgstr "紙張格式:"
 
-#: www/maposmatic/templates/maposmatic/new.html:468
+#: www/maposmatic/templates/maposmatic/new.html:472
 msgid "Almost there!"
 msgstr "快好了! "
 
-#: www/maposmatic/templates/maposmatic/new.html:470
+#: www/maposmatic/templates/maposmatic/new.html:474
 #, fuzzy
 #| msgid ""
 #| "You're almost ready to request to map rendering! Select the map\n"
@@ -1778,6 +1798,20 @@ msgstr ""
 msgid "Start typing for suggestions..."
 msgstr "輸入建議…"
 
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:21
+msgid "Select area"
+msgstr ""
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:22
+#, fuzzy
+#| msgid "Geographic area selection"
+msgid "Remove selection"
+msgstr "地理區域選擇"
+
+#: www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js:25
+msgid "Select area within current zoom"
+msgstr ""
+
 #: www/maposmatic/templatetags/extratags.py:48
 msgid "Waiting for rendering to begin..."
 msgstr "等待開始繪製…"
@@ -1931,6 +1965,16 @@ msgstr ""
 #~ msgid "Rendering of job #%(jobid)s failed"
 #~ msgstr "繪製保護進程(daemon): "
 
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s succeeded"
+#~ msgstr "繪製保護進程(daemon): "
+
+#, fuzzy
+#~| msgid "Rendering daemon: "
+#~ msgid "Rendering of job #%(jobid)s timed out"
+#~ msgstr "繪製保護進程(daemon): "
+
 #~ msgid "Full-page layout without street index"
 #~ msgstr "全頁輸出(不含街道索引)"
 
diff --git a/www/maposmatic/templates/maposmatic/new.html b/www/maposmatic/templates/maposmatic/new.html
index bfeeb4a8..e800318c 100644
--- a/www/maposmatic/templates/maposmatic/new.html
+++ b/www/maposmatic/templates/maposmatic/new.html
@@ -38,6 +38,10 @@
 {% include "maposmatic/suggest.js" %}
 {% include "maposmatic/wizard.js" %}
 $('.multipleSelect').fastselect({
+    placeholder: '{% trans "Choose overlay(s)" %}',
+    searchPlaceholder: '{% trans "Search overlay" %}',
+    noResultsText: '{% trans "No results" %}',
+    userOptionPrefix: '{% trans "Add" %} ',
     onItemSelect: function($item, itemModel) {
         $("#overlay-preview").attr("src","/media/img/overlay/"+itemModel.value+".jpg");
     }
diff --git a/www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js b/www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js
index d4165264..9eedc69f 100644
--- a/www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js
+++ b/www/maposmatic/templates/maposmatic/wizard-parts/wizardmap.js
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load l10n %}
 {% load extratags %}
 
 function wizardmap(elt) {
@@ -15,7 +16,16 @@ function wizardmap(elt) {
     strokeWidth: 2
   };
   var countryquery = null;
-  locationFilter = new L.LocationFilter({buttonPosition: 'topright'});
+  var locationFilter = new L.LocationFilter({
+      enableButton: {
+          enableText:  '{% trans "Select area" %}',
+          disableText: '{% trans "Remove selection" %}'
+      },
+      adjustButton: {
+          text: '{% trans "Select area within current zoom" %}'
+      },
+      buttonPosition: 'topright'
+  });
   locationFilter.on("change", function (e) {
       bbox = e.target.getBounds();
       map.fitBounds(bbox);