From 960a2925cab47d6ca8163cbfb5f34412e08db866 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 13 May 2021 12:38:12 +0100
Subject: [PATCH] Fix bug with determing whether another page exists when
 performing paginated searches

---
 packages/server/src/api/controllers/search/utils.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/api/controllers/search/utils.js b/packages/server/src/api/controllers/search/utils.js
index 6f2f29628a..b0a6322648 100644
--- a/packages/server/src/api/controllers/search/utils.js
+++ b/packages/server/src/api/controllers/search/utils.js
@@ -244,11 +244,15 @@ exports.paginatedSearch = async (
     .setSort(sort)
     .setSortOrder(sortOrder)
     .setSortType(sortType)
+  const searchUrl = builder
     .setBookmark(bookmark)
     .setLimit(limit)
-  const searchUrl = builder.buildSearchURL()
-  const nextUrl = builder.setLimit(1).buildSearchURL()
+    .buildSearchURL()
   const searchResults = await runQuery(searchUrl)
+  const nextUrl = builder
+    .setBookmark(searchResults.bookmark)
+    .setLimit(1)
+    .buildSearchURL()
   const nextResults = await runQuery(nextUrl)
   return {
     ...searchResults,