diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap
index 779b513915ea81..dc125ec4b8466f 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap
@@ -831,7 +831,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
 }
 
 .c3 {
-  padding-top: 12px;
+  margin-top: 12px;
 }
 
 .c0 {
@@ -1652,7 +1652,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         >
           <button
             aria-label="A disabled pagination button indicating that there cannot be any further navigation in the monitors list."
-            class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall c3"
+            class="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall c3"
             data-test-subj="xpack.uptime.monitorList.prevButton"
             disabled=""
             type="button"
@@ -1669,7 +1669,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
         >
           <button
             aria-label="A disabled pagination button indicating that there cannot be any further navigation in the monitors list."
-            class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall c3"
+            class="euiButtonIcon euiButtonIcon-isDisabled euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall c3"
             data-test-subj="xpack.uptime.monitorList.nextButton"
             disabled=""
             type="button"
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx
index 84614c8575cef8..1efc3e317113a5 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/overview_page_link.tsx
@@ -12,7 +12,7 @@ import styled from 'styled-components';
 import { useUrlParams } from '../../../hooks';
 
 const OverviewPageLinkButtonIcon = styled(EuiButtonIcon)`
-  padding-top: 12px;
+  margin-top: 12px;
 `;
 
 interface OverviewPageLinkProps {
@@ -52,7 +52,7 @@ export const OverviewPageLink: FunctionComponent<OverviewPageLinkProps> = ({
       data-test-subj={dataTestSubj}
       iconType={icon}
       aria-label={!pagination ? disableLinkLabel : ariaLabel}
-      disabled={!pagination}
+      isDisabled={!pagination}
     />
   );
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
index d749460ba997ca..3e410a0608094f 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts
@@ -144,7 +144,8 @@ export class QueryContext {
       this.pagination,
       this.filterClause,
       this.size,
-      this.statusFilter
+      this.statusFilter,
+      this.query
     );
   }