diff --git a/front/devices.php b/front/devices.php
index 4f56430a..1ce86e41 100755
--- a/front/devices.php
+++ b/front/devices.php
@@ -386,7 +386,7 @@ function filterDataByStatus(data, status) {
       case 'new':
         return item.dev_NewDevice === 1;
       case 'down':
-        return item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown  !== 0;
+        return (item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown  !== 0) || item.dev_PresentLastScan === 0;
       case 'archived':
         return item.dev_Archived === 1;
       default:
diff --git a/front/js/pialert_common.js b/front/js/pialert_common.js
index 7c3bf55d..53cfd631 100755
--- a/front/js/pialert_common.js
+++ b/front/js/pialert_common.js
@@ -845,14 +845,14 @@ function isRandomMAC(mac)
 function getDeviceDataByMacAddress(macAddress, dbColumn) {
 
   const sessionDataKey = 'devicesListAll_JSON';  
-  const sessionData = sessionStorage.getItem(sessionDataKey);
+  const devicesCache = getCache(sessionDataKey);
 
-  if (!sessionData || sessionData == "") {
-      console.log(`Session variable "${sessionDataKey}" not found.`);
+  if (!devicesCache || devicesCache == "") {
+      console.error(`Session variable "${sessionDataKey}" not found.`);
       return "Unknown";
   }
 
-  const devices = JSON.parse(sessionData);
+  const devices = JSON.parse(devicesCache);
 
   for (const device of devices) {
       if (device["dev_MAC"].toLowerCase() === macAddress.toLowerCase()) {
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index 2b618dad..9b8f8d00 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -185,7 +185,7 @@
     "Device_Shortcut_Archived": "Archived",
     "Device_Shortcut_Connected": "Connected",
     "Device_Shortcut_Devices": "Devices",
-    "Device_Shortcut_DownAlerts": "Down Alerts",
+    "Device_Shortcut_DownAlerts": "Down & Offline",
     "Device_Shortcut_Favorites": "Favorites",
     "Device_Shortcut_NewDevices": "New Devices",
     "Device_Shortcut_OnlineChart": "Device presence",
@@ -218,7 +218,7 @@
     "Device_Title": "Devices",
     "Donations_Others": "Others",
     "Donations_Platforms": "Sponsor platforms",
-    "Donations_Text": "Hey \ud83d\udc4b! </br> Thanks for clicking on this menu item \ud83d\ude05 </br> </br> I'm trying to collect some donations to make you better software. Also, it would help me not to get burned out. Me burning out might mean end of support for this app. Any small (recurring or not) sponsorship makes me want to put more effort into this app. I don't want to lock features (new plugins) behind paywalls \ud83d\udd10. </br>  If I had some recurring income I could shorten my workweek and in the remaining time fully focus on PiAlert. You'd get more functionality, a more polished app and less bugs. </br> </br> Thanks for reading - I'm grateful for any support \u2764\ud83d\ude4f </br>  </br> TL;DR: By supporting me you get: </br>  </br> <ul><li>Regular updates to keep your data and family safe \ud83d\udd04</li><li>Less bugs \ud83d\udc1b\ud83d\udd2b</li><li>Better and more functionality\u2795</li><li>I don't get burned out \ud83d\udd25\ud83e\udd2f</li><li>Less rushed releases \ud83d\udca8</li><li>Better docs\ud83d\udcda</li><li>Quicker and better support with issues \ud83c\udd98</li></ul> </br> \ud83d\udce7Email me to <a href='mailto:jokob@duck.com?subject=PiAlert'>jokob@duck.com</a> if you want to get in touch or if I should add other sponsorship platforms. </br>",
+    "Donations_Text": "Hey \ud83d\udc4b! </br> Thanks for clicking on this menu item \ud83d\ude05 </br> </br> I'm trying to collect some donations to make you better software. Also, it would help me not to get burned out. Me burning out might mean end of support for this app. Any small (recurring or not) sponsorship makes me want to put more effort into this app. </br>  If I had some recurring income I could shorten my workweek and in the remaining time fully focus on PiAlert. You'd get more functionality, a more polished app and less bugs. </br> </br> Thanks for reading - I'm grateful for any support \u2764\ud83d\ude4f </br>  </br> TL;DR: By supporting me you get: </br>  </br> <ul><li>Regular updates to keep your data and family safe \ud83d\udd04</li><li>Less bugs \ud83d\udc1b\ud83d\udd2b</li><li>Better and more functionality\u2795</li><li>I don't get burned out \ud83d\udd25\ud83e\udd2f</li><li>Less rushed releases \ud83d\udca8</li><li>Better docs\ud83d\udcda</li><li>Quicker and better support with issues \ud83c\udd98</li></ul> </br> \ud83d\udce7Email me to <a href='mailto:jokob@duck.com?subject=PiAlert'>jokob@duck.com</a> if you want to get in touch or if I should add other sponsorship platforms. </br>",
     "Donations_Title": "Donations",
     "ENABLE_PLUGINS_description": "Enables the <a target=\"_blank\" href=\"https://github.com/jokob-sk/Pi.Alert/tree/main/front/plugins\">plugins</a> functionality. Loading plugins requires more hardware resources so you might want to disable them on low-powered system.",
     "ENABLE_PLUGINS_name": "Enable Plugins",