From f8416a4aec3112fb35d8f58dd77cdaa0dc016a79 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 19 Oct 2022 14:30:57 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/Search/Search.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/components/Search/Search.vue b/client/components/Search/Search.vue
index 28500ac..be49bec 100644
--- a/client/components/Search/Search.vue
+++ b/client/components/Search/Search.vue
@@ -182,7 +182,7 @@
                             <div v-if="isExpandedSeries(book) && book.books">
                                 <div v-if="book.showAllBooks" class="book-row column">
                                     <BookView
-                                        v-for="subbook in book.allBooks" :key="subbook.key"
+                                        v-for="subbook in book.allBooks" :key="subbook.id"
                                         :book="subbook" :genre-tree="genreTree"
                                         show-author
                                         :show-read-link="showReadLink"
@@ -330,6 +330,10 @@ const componentOptions = {
         search: {
             handler(newValue) {
                 this.limit = newValue.limit;
+
+                if (this.pageCount > 1)
+                    this.prevPage = this.search.page;
+
                 this.makeTitle();
                 this.refresh();
             },
@@ -761,10 +765,8 @@ class Search {
             this.search.page = this.prevPage;
         }
 
-        if (this.search.page > this.pageCount) {
-            this.prevPage = this.search.page;
+        if (this.search.page > this.pageCount)
             this.search.page = 1;
-        }
     }
 
     getBookCount(item) {