diff --git a/ESP32_AP-Flasher/data/www/content_cards.json.gz b/ESP32_AP-Flasher/data/www/content_cards.json.gz
index 41cbe7c3..b0ba24ab 100644
Binary files a/ESP32_AP-Flasher/data/www/content_cards.json.gz and b/ESP32_AP-Flasher/data/www/content_cards.json.gz differ
diff --git a/ESP32_AP-Flasher/data/www/index.html.gz b/ESP32_AP-Flasher/data/www/index.html.gz
index f7c56311..18e26bb4 100644
Binary files a/ESP32_AP-Flasher/data/www/index.html.gz and b/ESP32_AP-Flasher/data/www/index.html.gz differ
diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz
index 87a551ef..269c0856 100644
Binary files a/ESP32_AP-Flasher/data/www/main.js.gz and b/ESP32_AP-Flasher/data/www/main.js.gz differ
diff --git a/ESP32_AP-Flasher/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp
index a33baa11..f29d4bab 100644
--- a/ESP32_AP-Flasher/src/main.cpp
+++ b/ESP32_AP-Flasher/src/main.cpp
@@ -131,8 +131,9 @@ void setup() {
     if (!loadDB("/current/tagDB.json")) {
         Serial.println("unable to load tagDB, reverting to backup");
         loadDB("/current/tagDB.json.bak");
+    } else {
+        cleanupCurrent();
     }
-    cleanupCurrent();
     xTaskCreate(APTask, "AP Process", 6000, NULL, 2, NULL);
     vTaskDelay(10 / portTICK_PERIOD_MS);
 
diff --git a/ESP32_AP-Flasher/wwwroot/index.html b/ESP32_AP-Flasher/wwwroot/index.html
index aef4f3fd..7e93d334 100644
--- a/ESP32_AP-Flasher/wwwroot/index.html
+++ b/ESP32_AP-Flasher/wwwroot/index.html
@@ -398,7 +398,10 @@
 				</p>
 				<p>
 					<a href="/backup_db" id="downloadDBbutton">Download tagDB</a>
-					<input type="file" id="fileInput" /><button id="uploadButton">Restore tagDB</button>
+					<input type="file" id="fileInput" /><button id="uploadButton">Restore tagDB</button> from file
+				</p>
+				<p>
+					<button id="restoreFromLocal" class="wifibutton">Restore tagDB</button> Restores the tagDB with the auto-saved version by the browser.
 				</p>
 				<p>
 					<button type="button" id="updatebutton" class="tablinks" data-target="updatetab" title="Update">Update</button> Manage firmware of the ESP32
diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js
index 32a7cef0..7990b67c 100644
--- a/ESP32_AP-Flasher/wwwroot/main.js
+++ b/ESP32_AP-Flasher/wwwroot/main.js
@@ -558,6 +558,7 @@ $('#cfgsave').onclick = function () {
 
 	$('#advancedoptions').style.height = '0px';
 	$('#configbox').close();
+	backupTagDB();
 }
 
 function sendCmd(mac, cmd) {
@@ -627,7 +628,7 @@ $('#cfgautoupdate').onclick = async function () {
 	var version = info[0][tagtype]["version"];
 	var currentversion = $('#tag' + mac).dataset.ver | 0;
 	if (confirm(`Current version: ${currentversion} 0x${currentversion.toString(16)}\nPending version: ${parseInt(version, 16)} 0x${parseInt(version, 16).toString(16)}\n\nNOTE: Every OTA update comes with a risk of bricking the tag, if it is bricked, it only can be recoverd with a tag flasher. Please only update if you need the new features.\n\nPress Cancel if you want to get out of here, or press OK if you want to proceed with the update.`)) {
-	
+
 		var md5 = info[0][tagtype]["md5"];
 		var fullFilename = name + "_" + version + ".bin";
 		var filepath = "/" + fullFilename;
@@ -786,6 +787,46 @@ $('#uploadButton').onclick = function () {
 	}
 }
 
+$('#restoreFromLocal').onclick = function () {
+	var tagDBrestore = localStorage.getItem('tagDB');
+	if (tagDBrestore) {
+		tagDBobj = JSON.parse(tagDBrestore);
+		var tagResult = [];
+
+		for (var key in tagDBobj) {
+			if (tagDBobj.hasOwnProperty(key)) {
+				tagResult.push([tagDBobj[key]]);
+			}
+		}
+
+		const blob = new Blob([JSON.stringify(tagResult, null, '\t')], { type: 'application/json' });
+		const formData = new FormData();
+		formData.append('file', blob, 'tagResult.json');
+
+		fetch('/restore_db', {
+			method: 'POST',
+			body: formData
+		})
+			.then(response => {
+				if (!response.ok) {
+					throw new Error(`HTTP error! Status: ${response.status}`);
+				}
+				return response.text();
+			})
+			.then(data => {
+				console.log('File uploaded successfully: ', data);
+				alert('TagDB restored. Webpage will reload.');
+				location.reload();
+			})
+			.catch(error => {
+				console.error('Error uploading file:', error);
+				alert('Error uploading file: ' + error);
+			});
+	} else {
+		console.log('No data found in localStorage');
+	}
+}
+
 async function loadOTA() {
 	otamodule = await import('./ota.js?v=' + Date.now());
 	otamodule.initUpdate();
@@ -1003,7 +1044,7 @@ function showMessage(message, iserr) {
 				div.classList.add("tagxfer");
 				(function (tagmac) {
 					setTimeout(function () { $('#tag' + tagmac).classList.remove("tagxfer"); }, 200);
-				})(message.substring(0, 16));	
+				})(message.substring(0, 16));
 			}
 		}
 	}
@@ -1042,16 +1083,21 @@ function processQueue() {
 
 	const canvas = $('#tag' + id + ' .tagimg');
 	canvas.style.display = 'block';
+	// console.log('fetch ' + imageSrc);
 
 	fetch(imageSrc, { cache: "force-cache" })
 		.then(response => response.arrayBuffer())
 		.then(buffer => {
+			// console.log('mac ' + id +' draw ' + imageSrc + ' hwtype ' + hwtype);
 			[canvas.width, canvas.height] = [tagTypes[hwtype].width, tagTypes[hwtype].height] || [0, 0];
 			if (tagTypes[hwtype].rotatebuffer) [canvas.width, canvas.height] = [canvas.height, canvas.width];
 			const ctx = canvas.getContext('2d');
 			const imageData = ctx.createImageData(canvas.width, canvas.height);
 			const data = new Uint8ClampedArray(buffer);
-			if (data.length == 0) canvas.style.display = 'none';
+			if (data.length == 0) {
+				console.log(imageSrc + ' empty');
+				canvas.style.display = 'none';
+			}
 
 			if (tagTypes[hwtype].bpp == 16) {
 				const is16Bit = data.length == tagTypes[hwtype].width * tagTypes[hwtype].height * 2;
@@ -1606,4 +1652,8 @@ function debounce(func, delay) {
 			func.apply(context, args);
 		}, delay);
 	};
+}
+
+function backupTagDB() {
+	localStorage.setItem("tagDB", JSON.stringify(tagDB));
 }
\ No newline at end of file