diff --git a/backend/drime/api/types.go b/backend/drime/api/types.go
index f2d18af6f..9396034fa 100644
--- a/backend/drime/api/types.go
+++ b/backend/drime/api/types.go
@@ -77,9 +77,9 @@ type Listing struct {
 	Data        []Item `json:"data"`
 	From        int    `json:"from"`
 	LastPage    int    `json:"last_page"`
-	NextPage    int    `json:"next_page"`
+	NextPageURL string `json:"next_page_url"`
 	PerPage     int    `json:"per_page"`
-	PrevPage    int    `json:"prev_page"`
+	PrevPageURL string `json:"prev_page_url"`
 	To          int    `json:"to"`
 	Total       int    `json:"total"`
 }
diff --git a/backend/drime/drime.go b/backend/drime/drime.go
index a8bbfb540..3960c0d5f 100644
--- a/backend/drime/drime.go
+++ b/backend/drime/drime.go
@@ -565,10 +565,10 @@ OUTER:
 				break OUTER
 			}
 		}
-		if result.NextPage == 0 {
+		if result.CurrentPage == result.LastPage {
 			break
 		}
-		page = result.NextPage
+		page = result.CurrentPage + 1
 	}
 	return found, err
 }