diff --git a/client/components/controls/LibraryFilterSelect.vue b/client/components/controls/LibraryFilterSelect.vue
index d8ff6bb1..0da84bb2 100644
--- a/client/components/controls/LibraryFilterSelect.vue
+++ b/client/components/controls/LibraryFilterSelect.vue
@@ -174,6 +174,11 @@ export default {
           value: 'missing',
           sublist: true
         },
+        {
+          text: this.$strings.LabelTracks,
+          value: 'tracks',
+          sublist: true
+        },
         {
           text: this.$strings.ButtonIssues,
           value: 'issues',
@@ -265,6 +270,18 @@ export default {
     progress() {
       return [this.$strings.LabelFinished, this.$strings.LabelInProgress, this.$strings.LabelNotStarted, this.$strings.LabelNotFinished]
     },
+    tracks() {
+      return [
+        {
+          id: 'single',
+          name: this.$strings.LabelTracksSingleTrack
+        },
+        {
+          id: 'multi',
+          name: this.$strings.LabelTracksMultiTrack
+        }
+      ]
+    },
     missing() {
       return ['ASIN', 'ISBN', this.$strings.LabelSubtitle, this.$strings.LabelAuthor, this.$strings.LabelPublishYear, this.$strings.LabelSeries, this.$strings.LabelDescription, this.$strings.LabelGenres, this.$strings.LabelTags, this.$strings.LabelNarrator, this.$strings.LabelPublisher, this.$strings.LabelLanguage]
     },
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 73907bde..53f81baf 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -389,6 +389,9 @@
   "LabelTotalTimeListened": "Total Time Listened",
   "LabelTrackFromFilename": "Track from Filename",
   "LabelTrackFromMetadata": "Track from Metadata",
+  "LabelTracks": "Tracks",
+  "LabelTracksMultiTrack": "Multi-track",
+  "LabelTracksSingleTrack": "Single-track",
   "LabelType": "Type",
   "LabelUnknown": "Unknown",
   "LabelUpdateCover": "Update Cover",
diff --git a/server/utils/libraryHelpers.js b/server/utils/libraryHelpers.js
index 3d33b823..22b66a5c 100644
--- a/server/utils/libraryHelpers.js
+++ b/server/utils/libraryHelpers.js
@@ -10,26 +10,26 @@ module.exports = {
   },
 
   getFilteredLibraryItems(libraryItems, filterBy, user, feedsArray) {
-    var filtered = libraryItems
+    let filtered = libraryItems
 
-    var searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators', 'missing', 'languages']
-    var group = searchGroups.find(_group => filterBy.startsWith(_group + '.'))
+    const searchGroups = ['genres', 'tags', 'series', 'authors', 'progress', 'narrators', 'missing', 'languages', 'tracks']
+    const group = searchGroups.find(_group => filterBy.startsWith(_group + '.'))
     if (group) {
-      var filterVal = filterBy.replace(`${group}.`, '')
-      var filter = this.decode(filterVal)
+      const filterVal = filterBy.replace(`${group}.`, '')
+      const filter = this.decode(filterVal)
       if (group === 'genres') filtered = filtered.filter(li => li.media.metadata && li.media.metadata.genres.includes(filter))
       else if (group === 'tags') filtered = filtered.filter(li => li.media.tags.includes(filter))
       else if (group === 'series') {
-        if (filter === 'No Series') filtered = filtered.filter(li => li.mediaType === 'book' && !li.media.metadata.series.length)
+        if (filter === 'No Series') filtered = filtered.filter(li => li.isBook && !li.media.metadata.series.length)
         else {
-          filtered = filtered.filter(li => li.mediaType === 'book' && li.media.metadata.hasSeries(filter))
+          filtered = filtered.filter(li => li.isBook && li.media.metadata.hasSeries(filter))
         }
       }
-      else if (group === 'authors') filtered = filtered.filter(li => li.mediaType === 'book' && li.media.metadata.hasAuthor(filter))
-      else if (group === 'narrators') filtered = filtered.filter(li => li.mediaType === 'book' && li.media.metadata.hasNarrator(filter))
+      else if (group === 'authors') filtered = filtered.filter(li => li.isBook && li.media.metadata.hasAuthor(filter))
+      else if (group === 'narrators') filtered = filtered.filter(li => li.isBook && li.media.metadata.hasNarrator(filter))
       else if (group === 'progress') {
         filtered = filtered.filter(li => {
-          var itemProgress = user.getMediaProgress(li.id)
+          const itemProgress = user.getMediaProgress(li.id)
           if (filter === 'Finished' && (itemProgress && itemProgress.isFinished)) return true
           if (filter === 'Not Started' && !itemProgress) return true
           if (filter === 'Not Finished' && (!itemProgress || !itemProgress.isFinished)) return true
@@ -38,25 +38,28 @@ module.exports = {
         })
       } else if (group == 'missing') {
         filtered = filtered.filter(li => {
-          if (li.mediaType === 'book') {
-            if (filter === 'ASIN' && li.media.metadata.asin === null) return true;
-            if (filter === 'ISBN' && li.media.metadata.isbn === null) return true;
-            if (filter === 'Subtitle' && li.media.metadata.subtitle === null) return true;
-            if (filter === 'Author' && li.media.metadata.authors.length === 0) return true;
-            if (filter === 'Publish Year' && li.media.metadata.publishedYear === null) return true;
-            if (filter === 'Series' && li.media.metadata.series.length === 0) return true;
-            if (filter === 'Description' && li.media.metadata.description === null) return true;
-            if (filter === 'Genres' && li.media.metadata.genres.length === 0) return true;
-            if (filter === 'Tags' && li.media.tags.length === 0) return true;
-            if (filter === 'Narrator' && li.media.metadata.narrators.length === 0) return true;
-            if (filter === 'Publisher' && li.media.metadata.publisher === null) return true;
-            if (filter === 'Language' && li.media.metadata.language === null) return true;
+          if (li.isBook) {
+            if (filter === 'ASIN' && li.media.metadata.asin === null) return true
+            if (filter === 'ISBN' && li.media.metadata.isbn === null) return true
+            if (filter === 'Subtitle' && li.media.metadata.subtitle === null) return true
+            if (filter === 'Author' && li.media.metadata.authors.length === 0) return true
+            if (filter === 'Publish Year' && li.media.metadata.publishedYear === null) return true
+            if (filter === 'Series' && li.media.metadata.series.length === 0) return true
+            if (filter === 'Description' && li.media.metadata.description === null) return true
+            if (filter === 'Genres' && li.media.metadata.genres.length === 0) return true
+            if (filter === 'Tags' && li.media.tags.length === 0) return true
+            if (filter === 'Narrator' && li.media.metadata.narrators.length === 0) return true
+            if (filter === 'Publisher' && li.media.metadata.publisher === null) return true
+            if (filter === 'Language' && li.media.metadata.language === null) return true
           } else {
             return false
           }
         })
       } else if (group === 'languages') {
         filtered = filtered.filter(li => li.media.metadata && li.media.metadata.language === filter)
+      } else if (group === 'tracks') {
+        if (filter === 'single') filtered = filtered.filter(li => li.isBook && li.media.numTracks === 1)
+        else if (filter === 'multi') filtered = filtered.filter(li => li.isBook && li.media.numTracks > 1)
       }
     } else if (filterBy === 'issues') {
       filtered = filtered.filter(li => li.hasIssues)