diff --git a/frontend/widgets/src/QueryApi.Editor.jsx b/frontend/widgets/src/QueryApi.Editor.jsx
index bfffc7b2..4092627d 100644
--- a/frontend/widgets/src/QueryApi.Editor.jsx
+++ b/frontend/widgets/src/QueryApi.Editor.jsx
@@ -83,18 +83,16 @@ const requestHandler = (request, response) => {
   }
 };
 
-const props = {
-  externalAppUrl,
-  path,
-  initialViewHeight,
-  initialPayload,
-  requestHandler,
-};
-
 // NearSocialBridgeCore widget is the core that makes all the "magic" happens
 return (
   <Widget
     src={"wendersonpires.near/widget/NearSocialBridgeCore"}
-    props={props}
+    props={{
+      externalAppUrl,
+      path,
+      initialViewHeight,
+      initialPayload,
+      requestHandler,
+    }}
   />
 );
diff --git a/frontend/widgets/src/QueryApi.IndexerExplorer.jsx b/frontend/widgets/src/QueryApi.IndexerExplorer.jsx
index 8456be1c..cc08954d 100644
--- a/frontend/widgets/src/QueryApi.IndexerExplorer.jsx
+++ b/frontend/widgets/src/QueryApi.IndexerExplorer.jsx
@@ -188,11 +188,12 @@ useEffect(() => {
 }, [selectedTab, hasMetadataRendered]);
 
 const handleLoadMore = () => {
-  const start = page * PAGE_SIZE;
+  const nextPage = page + 1;
+  const start = nextPage * PAGE_SIZE;
   const end = start + PAGE_SIZE;
   const newIndexers = indexers.slice(start, end);
   setCurrentPageIndexer([...currentPageIndexer, ...newIndexers]);
-  setPage(page + 1);
+  setPage(nextPage);
 };
 
 const backupNearRPCRequest = () => {