diff --git a/scripts/pi-hole/js/db_lists.js b/scripts/pi-hole/js/db_lists.js
index 2bf3bad4..19e71ba6 100644
--- a/scripts/pi-hole/js/db_lists.js
+++ b/scripts/pi-hole/js/db_lists.js
@@ -29,12 +29,14 @@ $(function () {
       timePicker: true, timePickerIncrement: 15,
       locale: { format: "MMMM Do YYYY, h:mm A" },
       ranges: {
-        "Today": [moment(), moment()],
-        "Yesterday": [moment().subtract(1, "days"), moment().subtract(1, "days")],
+        "Today": [moment().startOf("day"), moment()],
+        "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
         "Last 7 Days": [moment().subtract(6, "days"), moment()],
         "Last 30 Days": [moment().subtract(29, "days"), moment()],
-        "This Month": [moment().startOf("month"), moment().endOf("month")],
-        "Last Month": [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")]
+        "This Month": [moment().startOf("month"), moment()],
+        "Last Month": [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")],
+        "This Year": [moment().startOf("year"), moment()],
+        "All Time": [moment(0), moment()]
       },
       startDate: start__, endDate: end__,
       "opens": "center", "showDropdowns": true
diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
index e2d57ab7..35eb9f15 100644
--- a/scripts/pi-hole/js/db_queries.js
+++ b/scripts/pi-hole/js/db_queries.js
@@ -29,12 +29,14 @@ $(function () {
       timePicker: true, timePickerIncrement: 15,
       locale: { format: "MMMM Do YYYY, h:mm A" },
       ranges: {
-        "Today": [moment(), moment()],
-        "Yesterday": [moment().subtract(1, "days"), moment().subtract(1, "days")],
+        "Today": [moment().startOf("day"), moment()],
+        "Yesterday": [moment().subtract(1, "days").startOf("day"), moment().subtract(1, "days").endOf("day")],
         "Last 7 Days": [moment().subtract(6, "days"), moment()],
         "Last 30 Days": [moment().subtract(29, "days"), moment()],
-        "This Month": [moment().startOf("month"), moment().endOf("month")],
-        "Last Month": [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")]
+        "This Month": [moment().startOf("month"), moment()],
+        "Last Month": [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")],
+        "This Year": [moment().startOf("year"), moment()],
+        "All Time": [moment(0), moment()]
       },
       startDate: start__, endDate: end__,
       "opens": "center", "showDropdowns": true