diff --git a/scripts/pi-hole/js/db_graph.js b/scripts/pi-hole/js/db_graph.js
index da0e3531..9699d325 100644
--- a/scripts/pi-hole/js/db_graph.js
+++ b/scripts/pi-hole/js/db_graph.js
@@ -23,6 +23,7 @@ $(function () {
     {
       timePicker: true, timePickerIncrement: 15,
       locale: { format: dateformat },
+      startDate: start__, endDate: end__,
       ranges: {
         "Today": [moment().startOf("day"), moment()],
         "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
diff --git a/scripts/pi-hole/js/db_lists.js b/scripts/pi-hole/js/db_lists.js
index ca3a6238..36228b42 100644
--- a/scripts/pi-hole/js/db_lists.js
+++ b/scripts/pi-hole/js/db_lists.js
@@ -24,6 +24,7 @@ $(function () {
     {
       timePicker: true, timePickerIncrement: 15,
       locale: { format: "MMMM Do YYYY, HH:mm" },
+      startDate: start__, endDate: end__,
       ranges: {
         "Today": [moment().startOf("day"), moment()],
         "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
index 81c22867..630bfced 100644
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -38,6 +38,7 @@ $(function () {
     {
       timePicker: true, timePickerIncrement: 15,
       locale: { format: "MMMM Do YYYY, HH:mm" },
+      startDate: start__, endDate: end__,
       ranges: {
         "Today": [moment().startOf("day"), moment()],
         "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index dafa4ac3..f36e76e1 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -170,7 +170,7 @@ $(document).ready(function() {
                 dnssec_status = "<br><span style=\"color:red\">ABANDONED</span>";
                 break;
             case "5":
-                dnssec_status = "<br><span style=\"color:red\">?</span>";
+                dnssec_status = "<br><span style=\"color:red\">UNKNOWN</span>";
                 break;
             default: // No DNSSEC
                 dnssec_status = "";
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 8b7389ec..fc358d66 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -578,6 +578,11 @@ function readAdlists()
 							$error .= "Static release for MAC address (".htmlspecialchars($mac).") already defined!<br>";
 							break;
 						}
+						if($ip !== "noip" && $lease["IP"] === $ip)
+						{
+							$error .= "Static lease for IP address (".htmlspecialchars($ip).") already defined!<br>";
+							break;
+						}
 					}
 
 					if(!strlen($error))