diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Audit/AuditLogPage.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Audit/AuditLogPage.razor
index 1e492af4..a09533a5 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Audit/AuditLogPage.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Audit/AuditLogPage.razor
@@ -39,6 +39,16 @@
                             @onclick="() => SetWindowAsync(168)" disabled="@_trendsLoading">
                         7d
                     </button>
+                    <button type="button"
+                            class="btn @(_windowHours == 720 ? "btn-secondary" : "btn-outline-secondary")"
+                            @onclick="() => SetWindowAsync(720)" disabled="@_trendsLoading">
+                        30d
+                    </button>
+                    <button type="button"
+                            class="btn @(_windowHours == 2160 ? "btn-secondary" : "btn-outline-secondary")"
+                            @onclick="() => SetWindowAsync(2160)" disabled="@_trendsLoading">
+                        90d
+                    </button>
                 </div>
             }
         </div>
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Monitoring/Health.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Monitoring/Health.razor
index 4a0d273a..a26d8442 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Monitoring/Health.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Monitoring/Health.razor
@@ -109,6 +109,12 @@
                 <button type="button"
                         class="btn @(_trendWindowHours == 168 ? "btn-primary" : "btn-outline-secondary")"
                         @onclick="() => SetTrendWindowAsync(168)" disabled="@_trendsLoading">7d</button>
+                <button type="button"
+                        class="btn @(_trendWindowHours == 720 ? "btn-primary" : "btn-outline-secondary")"
+                        @onclick="() => SetTrendWindowAsync(720)" disabled="@_trendsLoading">30d</button>
+                <button type="button"
+                        class="btn @(_trendWindowHours == 2160 ? "btn-primary" : "btn-outline-secondary")"
+                        @onclick="() => SetTrendWindowAsync(2160)" disabled="@_trendsLoading">90d</button>
             </div>
         </div>
         <div class="card-body p-3">
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Notifications/NotificationKpis.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Notifications/NotificationKpis.razor
index 6c06347d..93df1e40 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Notifications/NotificationKpis.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Notifications/NotificationKpis.razor
@@ -172,6 +172,12 @@
             <button type="button"
                     class="btn @(_windowHours == 168 ? "btn-primary" : "btn-outline-secondary")"
                     @onclick="() => SetWindowAsync(168)" disabled="@_trendsLoading">7d</button>
+            <button type="button"
+                    class="btn @(_windowHours == 720 ? "btn-primary" : "btn-outline-secondary")"
+                    @onclick="() => SetWindowAsync(720)" disabled="@_trendsLoading">30d</button>
+            <button type="button"
+                    class="btn @(_windowHours == 2160 ? "btn-primary" : "btn-outline-secondary")"
+                    @onclick="() => SetWindowAsync(2160)" disabled="@_trendsLoading">90d</button>
         </div>
     </div>
     <div class="row g-3">
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/SiteCalls/SiteCallsReport.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/SiteCalls/SiteCallsReport.razor
index 02abf21f..0a9c640d 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/SiteCalls/SiteCallsReport.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/SiteCalls/SiteCallsReport.razor
@@ -248,6 +248,12 @@
                     <button type="button"
                             class="btn @(_windowHours == 168 ? "btn-primary" : "btn-outline-secondary")"
                             @onclick="() => SetWindowAsync(168)" disabled="@_trendsLoading">7d</button>
+                    <button type="button"
+                            class="btn @(_windowHours == 720 ? "btn-primary" : "btn-outline-secondary")"
+                            @onclick="() => SetWindowAsync(720)" disabled="@_trendsLoading">30d</button>
+                    <button type="button"
+                            class="btn @(_windowHours == 2160 ? "btn-primary" : "btn-outline-secondary")"
+                            @onclick="() => SetWindowAsync(2160)" disabled="@_trendsLoading">90d</button>
                 </div>
             }
         </div>
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/AuditLogPageTrendTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/AuditLogPageTrendTests.cs
index 76fbbfb1..e0971345 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/AuditLogPageTrendTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/AuditLogPageTrendTests.cs
@@ -117,6 +117,44 @@ public class AuditLogPageTrendTests : BunitContext
             Arg.Any<DateTime>(), Arg.Any<DateTime>(), Arg.Any<int?>(), Arg.Any<CancellationToken>());
     }
 
+    [Fact]
+    public void TrendsPanel_LongRangeWindows_RenderAndRefetchWithMatchingSpan()
+    {
+        // The 30d (720h) / 90d (2160h) buttons added for the hourly-rollup path
+        // (plan #22 T7) must render alongside 24h/7d and, when clicked, re-fetch
+        // every series over the corresponding range — the query service then
+        // transparently routes the long windows to hourly rollups.
+        var ranges = new List<(DateTime From, DateTime To)>();
+        var kpi = Substitute.For<IKpiHistoryQueryService>();
+        kpi.GetSeriesAsync(
+                Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string?>(),
+                Arg.Any<DateTime>(), Arg.Any<DateTime>(), Arg.Any<int?>(), Arg.Any<CancellationToken>())
+            .Returns(ci =>
+            {
+                ranges.Add((ci.ArgAt<DateTime>(4), ci.ArgAt<DateTime>(5)));
+                return Task.FromResult(ThreePoints());
+            });
+
+        var cut = RenderAuditLogPage(kpi);
+
+        // Both new window buttons render in the toggle group.
+        cut.WaitForAssertion(() =>
+        {
+            Assert.Contains(cut.FindAll("button"), b => b.TextContent.Trim() == "30d");
+            Assert.Contains(cut.FindAll("button"), b => b.TextContent.Trim() == "90d");
+        });
+
+        // Click 30d — every series re-fetches over a ~720h span.
+        cut.FindAll("button").First(b => b.TextContent.Trim() == "30d").Click();
+        cut.WaitForAssertion(() =>
+            Assert.Contains(ranges, r => Math.Abs((r.To - r.From).TotalHours - 720) < 0.5));
+
+        // Click 90d — every series re-fetches over a ~2160h span.
+        cut.FindAll("button").First(b => b.TextContent.Trim() == "90d").Click();
+        cut.WaitForAssertion(() =>
+            Assert.Contains(ranges, r => Math.Abs((r.To - r.From).TotalHours - 2160) < 0.5));
+    }
+
     [Fact]
     public void TrendsPanel_WhenQueryServiceThrows_PageStillRenders()
     {
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs
index bd35a2fa..d32ebff3 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Pages/SiteCallsReportPageTests.cs
@@ -590,6 +590,31 @@ public class SiteCallsReportPageTests : BunitContext
             Assert.True(_kpiHistory.ReceivedCalls().Count() > afterExpand));
     }
 
+    [Fact]
+    public void TrendsSection_LongRangeWindows_RenderAndReloadSeries()
+    {
+        // The 30d/90d buttons (plan #22 T7) render alongside 24h/7d and clicking
+        // one re-loads the series — the query service then routes the long window
+        // to hourly rollups transparently.
+        var cut = Render<SiteCallsReportPage>();
+        cut.WaitForState(() => cut.Markup.Contains("ERP.GetOrder"));
+
+        cut.Find("[data-test='site-calls-trends-toggle']").Click();
+        cut.WaitForAssertion(() => Assert.NotEmpty(cut.FindAll("[data-test^='kpi-trend-']")));
+
+        // Both long-range buttons are present in the toggle group.
+        Assert.Contains(cut.FindAll("button"), b => b.TextContent.Trim() == "30d");
+        Assert.Contains(cut.FindAll("button"), b => b.TextContent.Trim() == "90d");
+
+        var afterExpand = _kpiHistory.ReceivedCalls().Count();
+
+        // Switch the window to 90d — the series re-load (another batch of calls).
+        cut.FindAll("button").First(b => b.TextContent.Trim() == "90d").Click();
+
+        cut.WaitForAssertion(() =>
+            Assert.True(_kpiHistory.ReceivedCalls().Count() > afterExpand));
+    }
+
     [Fact]
     public void TrendsSection_WhenKpiHistoryThrows_PageStillRenders()
     {