diff --git a/client/components/modals/edit-tabs/Cover.vue b/client/components/modals/edit-tabs/Cover.vue
index fb8a493d..4ac1f5b6 100644
--- a/client/components/modals/edit-tabs/Cover.vue
+++ b/client/components/modals/edit-tabs/Cover.vue
@@ -40,7 +40,7 @@
           </div>
         </div>
 
-        <form @submit.prevent="submitSearchForm">
+        <!-- <form @submit.prevent="submitSearchForm">
           <div class="flex items-center justify-start -mx-1 py-2 mt-2">
             <div class="flex-grow px-1">
               <ui-text-input-with-label v-model="searchTitle" label="Search Title" placeholder="Search" :disabled="processing" />
@@ -52,17 +52,31 @@
               <ui-btn type="submit" class="mt-5 w-full" :padding-x="0">Search</ui-btn>
             </div>
           </div>
-        </form>
-        <div v-if="hasSearched" class="flex items-center flex-wrap justify-center max-h-80 overflow-y-scroll mt-2 max-w-full">
-          <p v-if="!coversFound.length">No Covers Found</p>
-          <template v-for="cover in coversFound">
-            <div :key="cover" class="m-0.5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover === imageUrl ? 'border-yellow-300' : ''" @click="updateCover(cover)">
-              <covers-preview-cover :src="cover" :width="80" show-open-new-tab :book-cover-aspect-ratio="bookCoverAspectRatio" />
-            </div>
-          </template>
-        </div>
+        </form> -->
       </div>
     </div>
+    <form @submit.prevent="submitSearchForm">
+      <div class="flex items-center justify-start -mx-1 h-20">
+        <div class="w-40 px-1">
+          <ui-dropdown v-model="provider" :items="providers" label="Provider" small />
+        </div>
+        <div class="w-72 px-1">
+          <ui-text-input-with-label v-model="searchTitle" :label="provider == 'audible' ? 'Search Title or ASIN' : 'Search Title'" placeholder="Search" />
+        </div>
+        <div class="w-72 px-1">
+          <ui-text-input-with-label v-model="searchAuthor" label="Author" />
+        </div>
+        <ui-btn class="mt-5 ml-1" type="submit">Search</ui-btn>
+      </div>
+    </form>
+    <div v-if="hasSearched" class="flex items-center flex-wrap justify-center max-h-80 overflow-y-scroll mt-2 max-w-full">
+      <p v-if="!coversFound.length">No Covers Found</p>
+      <template v-for="cover in coversFound">
+        <div :key="cover" class="m-0.5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover === imageUrl ? 'border-yellow-300' : ''" @click="updateCover(cover)">
+          <covers-preview-cover :src="cover" :width="80" show-open-new-tab :book-cover-aspect-ratio="bookCoverAspectRatio" />
+        </div>
+      </template>
+    </div>
 
     <div v-if="previewUpload" class="absolute top-0 left-0 w-full h-full z-10 bg-bg p-8">
       <p class="text-lg">Preview Cover</p>
@@ -97,7 +111,22 @@ export default {
       hasSearched: false,
       showLocalCovers: false,
       previewUpload: null,
-      selectedFile: null
+      selectedFile: null,
+      providers: [
+        {
+          text: 'Google Books',
+          value: 'google'
+        },
+        {
+          text: 'Open Library',
+          value: 'openlibrary'
+        },
+        {
+          text: 'Audible',
+          value: 'audible'
+        }
+      ],
+      provider: 'google'
     }
   },
   watch: {
@@ -201,6 +230,7 @@ export default {
       this.imageUrl = this.book.cover || ''
       this.searchTitle = this.book.title || ''
       this.searchAuthor = this.book.authorFL || ''
+      this.provider = localStorage.getItem('book-provider') || 'openlibrary'
     },
     removeCover() {
       if (!this.book.cover) {
@@ -254,14 +284,24 @@ export default {
       this.isProcessing = false
     },
     getSearchQuery() {
-      var searchQuery = `provider=openlibrary&title=${this.searchTitle}`
+      var searchQuery = `provider=${this.provider}&title=${this.searchTitle}`
       if (this.searchAuthor) searchQuery += `&author=${this.searchAuthor}`
       return searchQuery
     },
+    persistProvider() {
+      try {
+        localStorage.setItem('book-provider', this.provider)
+      } catch (error) {
+        console.error('PersistProvider', error)
+      }
+    },
     async submitSearchForm() {
+      // Store provider in local storage
+      this.persistProvider()
+
       this.isProcessing = true
       var searchQuery = this.getSearchQuery()
-      var results = await this.$axios.$get(`/api/find/covers?${searchQuery}`).catch((error) => {
+      var results = await this.$axios.$get(`/api/search/covers?${searchQuery}`).catch((error) => {
         console.error('Failed', error)
         return []
       })
diff --git a/client/components/modals/edit-tabs/Match.vue b/client/components/modals/edit-tabs/Match.vue
index b0667b13..f082bc48 100644
--- a/client/components/modals/edit-tabs/Match.vue
+++ b/client/components/modals/edit-tabs/Match.vue
@@ -159,6 +159,13 @@ export default {
     }
   },
   methods: {
+    persistProvider() {
+      try {
+        localStorage.setItem('book-provider', this.provider)
+      } catch (error) {
+        console.error('PersistProvider', error)
+      }
+    },
     getSearchQuery() {
       var searchQuery = `provider=${this.provider}&fallbackTitleOnly=1&title=${this.searchTitle}`
       if (this.searchAuthor) searchQuery += `&author=${this.searchAuthor}`
@@ -169,6 +176,7 @@ export default {
         this.$toast.warning('Search title is required')
         return
       }
+      this.persistProvider()
       this.runSearch()
     },
     async runSearch() {
@@ -177,7 +185,7 @@ export default {
       this.searchResults = []
       this.isProcessing = true
       this.lastSearch = searchQuery
-      var results = await this.$axios.$get(`/api/find/search?${searchQuery}`).catch((error) => {
+      var results = await this.$axios.$get(`/api/search/books?${searchQuery}`).catch((error) => {
         console.error('Failed', error)
         return []
       })
@@ -217,6 +225,7 @@ export default {
       }
       this.searchTitle = this.audiobook.book.title
       this.searchAuthor = this.audiobook.book.authorFL || ''
+      this.provider = localStorage.getItem('book-provider') || 'google'
     },
     selectMatch(match) {
       this.selectedMatch = match
diff --git a/server/ApiController.js b/server/ApiController.js
index 1ce4f188..fcad04b6 100644
--- a/server/ApiController.js
+++ b/server/ApiController.js
@@ -40,10 +40,6 @@ class ApiController {
   }
 
   init() {
-    this.router.get('/find/covers', this.findCovers.bind(this))
-    this.router.get('/find/:method', this.find.bind(this))
-
-
     //
     // Library Routes
     //
@@ -149,6 +145,12 @@ class ApiController {
     this.router.delete('/backup/:id', BackupController.delete.bind(this))
     this.router.post('/backup/upload', BackupController.upload.bind(this))
 
+    //
+    // Search Routes
+    //
+    this.router.get('/search/covers', this.findCovers.bind(this))
+    this.router.get('/search/books', this.findBooks.bind(this))
+
     //
     // Others
     //
@@ -174,16 +176,21 @@ class ApiController {
     this.router.post('/syncUserAudiobookData', this.syncUserAudiobookData.bind(this))
   }
 
-  async find(req, res) {
-    var provider = req.query.provider || 'google'
+  async findBooks(req, res) {
+    if (req.method === 'match') {
+
+    } else if (req.method === 'cover')
+      var provider = req.query.provider || 'google'
     var title = req.query.title || ''
     var author = req.query.author || ''
     var results = await this.bookFinder.search(provider, title, author)
     res.json(results)
   }
 
-  findCovers(req, res) {
-    this.scanner.findCovers(req, res)
+  async findCovers(req, res) {
+    var query = req.query
+    var result = await this.bookFinder.findCovers(query.provider, query.title, query.author || null)
+    res.json(result)
   }
 
   authorize(req, res) {
diff --git a/server/BookFinder.js b/server/BookFinder.js
index 6ad856a0..c7f18f22 100644
--- a/server/BookFinder.js
+++ b/server/BookFinder.js
@@ -147,7 +147,7 @@ class BookFinder {
     return booksFiltered
   }
 
-  async getGoogleBooksResults(title, author, maxTitleDistance, maxAuthorDistance) {
+  async getGoogleBooksResults(title, author) {
     var books = await this.googleBooks.search(title, author)
     if (this.verbose) Logger.debug(`GoogleBooks Book Search Results: ${books.length || 0}`)
     if (books.errorCode) {
@@ -158,7 +158,7 @@ class BookFinder {
     return books
   }
 
-  async getAudibleResults(title, author, maxTitleDistance, maxAuthorDistance) {
+  async getAudibleResults(title, author) {
     var books = await this.audible.search(title, author);
     if (this.verbose) Logger.debug(`Audible Book Search Results: ${books.length || 0}`)
     if (!books) return []
@@ -172,9 +172,9 @@ class BookFinder {
     Logger.debug(`Book Search: title: "${title}", author: "${author}", provider: ${provider}`)
 
     if (provider === 'google') {
-      return this.getGoogleBooksResults(title, author, maxTitleDistance, maxAuthorDistance)
+      return this.getGoogleBooksResults(title, author)
     } else if (provider === 'audible') {
-      return this.getAudibleResults(title, author, maxTitleDistance, maxAuthorDistance)
+      return this.getAudibleResults(title, author)
     } else if (provider === 'libgen') {
       books = await this.getLibGenResults(title, author, maxTitleDistance, maxAuthorDistance)
     } else if (provider === 'openlibrary') {