diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
index ec50e618c..7d332d61f 100644
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -230,6 +230,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
               <Button
                 onClick={() => {
                   delete search.search;
+                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -257,9 +258,11 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         loading={loading || searchLoading}
         pagination={
           search?.search
-            ? { pageSize: 25 }
+            ? {
+                pageSize: 25,
+                showSizeChanger: false,
+              }
             : {
-                position: "top",
                 pageSize: 25,
                 current: parseInt(page || 1),
                 total: total,
diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
index c06f04c78..718d056e8 100644
--- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
+++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
@@ -218,6 +218,7 @@ export function PaymentsListPaginated({
               <Button
                 onClick={() => {
                   delete search.search;
+                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -254,9 +255,11 @@ export function PaymentsListPaginated({
         scroll={{ x: true }}
         pagination={
           search?.search
-            ? { pageSize: 25 }
+            ? {
+                pageSize: 25,
+                showSizeChanger: false,
+              }
             : {
-                position: "top",
                 pageSize: 25,
                 current: parseInt(page || 1),
                 total: total,
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index bc1e50974..d52a69c9e 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -241,6 +241,7 @@ export function BillsListPage({
               <Button
                 onClick={() => {
                   delete search.search;
+                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -285,9 +286,11 @@ export function BillsListPage({
         scroll={{ x: true }}
         pagination={
           search?.search
-            ? { pageSize: 25 }
+            ? {
+                pageSize: 25,
+                showSizeChanger: false,
+              }
             : {
-                position: "top",
                 pageSize: 25,
                 current: parseInt(page || 1),
                 total: total,
diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js
index 9e45b8791..b93b70968 100644
--- a/server/opensearch/os-handler.js
+++ b/server/opensearch/os-handler.js
@@ -126,7 +126,6 @@ async function OpenSearchUpdateHandler(req, res) {
           `,
             { billId: req.body.event.data.new.id }
           );
-
           document = {
             ..._.pick(req.body.event.data.new, [
               "id",
@@ -138,7 +137,6 @@ async function OpenSearchUpdateHandler(req, res) {
             ...bill.bills_by_pk,
             bodyshopid: bill.bills_by_pk.job.shopid,
           };
-
           break;
         case "payments":
           //Query to get the job and RO number
@@ -179,11 +177,10 @@ async function OpenSearchUpdateHandler(req, res) {
               "type",
             ]),
             ...payment.payments_by_pk,
-            bodyshopid: bill.payments_by_pk.job.shopid,
+            bodyshopid: payment.payments_by_pk.job.shopid,
           };
           break;
       }
-
       const payload = {
         id: req.body.event.data.new.id,
         index: req.body.table.name,