diff --git a/client/components/app/Appbar.vue b/client/components/app/Appbar.vue
index 19b8fe3c6..bb452526d 100644
--- a/client/components/app/Appbar.vue
+++ b/client/components/app/Appbar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="w-full h-16 bg-primary relative">
-    <div id="appbar" class="absolute top-0 bottom-0 left-0 w-full h-full px-2 md:px-6 py-1 z-60">
+    <div id="appbar" role="toolbar" aria-label="Appbar" class="absolute top-0 bottom-0 left-0 w-full h-full px-2 md:px-6 py-1 z-60">
       <div class="flex h-full items-center">
         <nuxt-link to="/">
           <img src="~static/icon.svg" :alt="$strings.ButtonHome" class="w-8 min-w-8 h-8 mr-2 sm:w-10 sm:min-w-10 sm:h-10 sm:mr-4" />
diff --git a/client/components/app/BookShelfRow.vue b/client/components/app/BookShelfRow.vue
index 50fa140a7..6e19b9dca 100644
--- a/client/components/app/BookShelfRow.vue
+++ b/client/components/app/BookShelfRow.vue
@@ -37,18 +37,18 @@
     <div class="relative">
       <div class="relative text-center categoryPlacard transform z-30 top-0 left-4e md:left-8e w-44e rounded-md">
         <div class="w-full h-full shinyBlack flex items-center justify-center rounded-sm border" :style="{ padding: `0em 0.5em` }">
-          <p :style="{ fontSize: 0.9 + 'em' }">{{ $strings[shelf.labelStringKey] }}</p>
+          <h2 :style="{ fontSize: 0.9 + 'em' }">{{ $strings[shelf.labelStringKey] }}</h2>
         </div>
       </div>
 
       <div class="bookshelfDividerCategorized h-6e w-full absolute top-0 left-0 right-0 z-20"></div>
     </div>
-    <div v-show="canScrollLeft && !isScrolling" class="hidden sm:flex absolute top-0 left-0 w-32 pr-8 bg-black book-shelf-arrow-left items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollLeft">
+    <button v-show="canScrollLeft && !isScrolling" :aria-label="$strings.ButtonScrollLeft" class="hidden sm:flex absolute top-0 left-0 w-32 pr-8 bg-black book-shelf-arrow-left items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollLeft">
       <span class="material-symbols text-white" :style="{ fontSize: 3.75 + 'em' }">chevron_left</span>
-    </div>
-    <div v-show="canScrollRight && !isScrolling" class="hidden sm:flex absolute top-0 right-0 w-32 pl-8 bg-black book-shelf-arrow-right items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollRight">
+    </button>
+    <button v-show="canScrollRight && !isScrolling" :aria-label="$strings.ButtonScrollRight" class="hidden sm:flex absolute top-0 right-0 w-32 pl-8 bg-black book-shelf-arrow-right items-center justify-center cursor-pointer opacity-0 hover:opacity-100 z-40" @click="scrollRight">
       <span class="material-symbols text-white" :style="{ fontSize: 3.75 + 'em' }">chevron_right</span>
-    </div>
+    </button>
   </div>
 </template>
 
diff --git a/client/components/app/BookShelfToolbar.vue b/client/components/app/BookShelfToolbar.vue
index 04354c80a..6b5a3cd3a 100644
--- a/client/components/app/BookShelfToolbar.vue
+++ b/client/components/app/BookShelfToolbar.vue
@@ -43,7 +43,7 @@
         <p class="text-sm">{{ $strings.ButtonAdd }}</p>
       </nuxt-link>
     </div>
-    <div id="toolbar" class="absolute top-10 md:top-0 left-0 w-full h-10 md:h-full z-40 flex items-center justify-end md:justify-start px-2 md:px-8">
+    <div id="toolbar" role="toolbar" aria-label="Library Toolbar" class="absolute top-10 md:top-0 left-0 w-full h-10 md:h-full z-40 flex items-center justify-end md:justify-start px-2 md:px-8">
       <!-- Series books page -->
       <template v-if="selectedSeries">
         <p class="pl-2 text-base md:text-lg">
diff --git a/client/components/app/ConfigSideNav.vue b/client/components/app/ConfigSideNav.vue
index 108dc42d0..b42a560ea 100644
--- a/client/components/app/ConfigSideNav.vue
+++ b/client/components/app/ConfigSideNav.vue
@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div class="w-44 fixed left-0 top-16 bg-bg bg-opacity-100 md:bg-opacity-70 shadow-lg border-r border-white border-opacity-5 py-3 transform transition-transform mb-12 overflow-y-auto" :class="wrapperClass + ' ' + (streamLibraryItem ? 'h-[calc(100%-270px)]' : 'h-[calc(100%-110px)]')" v-click-outside="clickOutside">
+  <div role="toolbar" aria-orientation="vertical" aria-label="Config Sidebar">
+    <div role="navigation" aria-label="Config Navigation" class="w-44 fixed left-0 top-16 bg-bg bg-opacity-100 md:bg-opacity-70 shadow-lg border-r border-white border-opacity-5 py-3 transform transition-transform mb-12 overflow-y-auto" :class="wrapperClass + ' ' + (streamLibraryItem ? 'h-[calc(100%-270px)]' : 'h-[calc(100%-110px)]')" v-click-outside="clickOutside">
       <div v-show="isMobilePortrait" class="flex items-center justify-end pb-2 px-4 mb-1" @click="closeDrawer">
         <span class="material-symbols text-2xl">arrow_back</span>
       </div>
diff --git a/client/components/app/SideRail.vue b/client/components/app/SideRail.vue
index dbbc4d266..2c6fd5a23 100644
--- a/client/components/app/SideRail.vue
+++ b/client/components/app/SideRail.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="w-20 bg-bg h-full fixed left-0 box-shadow-side z-50" style="min-width: 80px" :style="{ top: offsetTop + 'px' }">
+  <div role="toolbar" aria-orientation="vertical" aria-label="Library Sidebar" class="w-20 bg-bg h-full fixed left-0 box-shadow-side z-50" style="min-width: 80px" :style="{ top: offsetTop + 'px' }">
     <!-- ugly little workaround to cover up the shadow overlapping the bookshelf toolbar -->
     <div v-if="isShowingBookshelfToolbar" class="absolute top-0 -right-4 w-4 bg-bg h-10 pointer-events-none" />
 
-    <div id="siderail-buttons-container" :class="{ 'player-open': streamLibraryItem }" class="w-full overflow-y-auto overflow-x-hidden">
+    <div id="siderail-buttons-container" role="navigation" aria-label="Library Navigation" :class="{ 'player-open': streamLibraryItem }" class="w-full overflow-y-auto overflow-x-hidden">
       <nuxt-link :to="`/library/${currentLibraryId}`" class="w-full h-20 flex flex-col items-center justify-center text-white border-b border-primary border-opacity-70 hover:bg-primary cursor-pointer relative" :class="homePage ? 'bg-primary bg-opacity-80' : 'bg-bg bg-opacity-60'">
         <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" />
diff --git a/client/components/cards/AuthorCard.vue b/client/components/cards/AuthorCard.vue
index 597aca99b..1dafa83bf 100644
--- a/client/components/cards/AuthorCard.vue
+++ b/client/components/cards/AuthorCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pb-3e" :style="{ minWidth: cardWidth + 'px', maxWidth: cardWidth + 'px' }">
+  <article class="pb-3e" :style="{ minWidth: cardWidth + 'px', maxWidth: cardWidth + 'px' }">
     <nuxt-link :to="`/author/${author?.id}`">
       <div cy-id="card" @mouseover="mouseover" @mouseleave="mouseleave">
         <div cy-id="imageArea" :style="{ height: cardHeight + 'px' }" class="bg-primary box-shadow-book rounded-md relative overflow-hidden">
@@ -34,7 +34,7 @@
         </div>
       </div>
     </nuxt-link>
-  </div>
+  </article>
 </template>
 
 <script>
diff --git a/client/components/cards/LazyBookCard.vue b/client/components/cards/LazyBookCard.vue
index 09424b3c6..cffa45a51 100644
--- a/client/components/cards/LazyBookCard.vue
+++ b/client/components/cards/LazyBookCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="card" :id="`book-card-${index}`" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <article ref="card" :id="`book-card-${index}`" tabindex="0" :aria-label="displayTitle" :style="{ minWidth: coverWidth + 'px', maxWidth: coverWidth + 'px' }" class="absolute rounded-sm z-10 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div :id="`cover-area-${index}`" class="relative w-full top-0 left-0 rounded overflow-hidden z-10 bg-primary box-shadow-book" :style="{ height: coverHeight + 'px ' }">
       <!-- When cover image does not fill -->
       <div cy-id="coverBg" v-show="showCoverBg" class="absolute top-0 left-0 w-full h-full overflow-hidden rounded-sm bg-primary">
@@ -14,21 +14,21 @@
       </div>
 
       <div class="w-full h-full absolute top-0 left-0 rounded overflow-hidden z-10">
-        <div cy-id="titleImageNotReady" v-show="libraryItem && !imageReady" class="absolute top-0 left-0 w-full h-full flex items-center justify-center" :style="{ padding: 0.5 + 'em' }">
+        <div cy-id="titleImageNotReady" v-show="libraryItem && !imageReady" aria-hidden="true" class="absolute top-0 left-0 w-full h-full flex items-center justify-center" :style="{ padding: 0.5 + 'em' }">
           <p :style="{ fontSize: 0.8 + 'em' }" class="text-gray-300 text-center">{{ title }}</p>
         </div>
 
         <!-- Cover Image -->
-        <img cy-id="coverImage" v-show="libraryItem" ref="cover" :src="bookCoverSrc" class="relative w-full h-full transition-opacity duration-300" :class="showCoverBg ? 'object-contain' : 'object-fill'" @load="imageLoaded" :style="{ opacity: imageReady ? 1 : 0 }" />
+        <img cy-id="coverImage" v-show="libraryItem" :alt="`${displayTitle}, ${$strings.LabelCover}`" ref="cover" aria-hidden="true" :src="bookCoverSrc" class="relative w-full h-full transition-opacity duration-300" :class="showCoverBg ? 'object-contain' : 'object-fill'" @load="imageLoaded" :style="{ opacity: imageReady ? 1 : 0 }" />
 
         <!-- Placeholder Cover Title & Author -->
         <div cy-id="placeholderTitle" v-if="!hasCover" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full flex items-center justify-center" :style="{ padding: placeholderCoverPadding + 'em' }">
           <div>
-            <p cy-id="placeholderTitleText" class="text-center" style="color: rgb(247 223 187)" :style="{ fontSize: titleFontSize + 'em' }">{{ titleCleaned }}</p>
+            <p cy-id="placeholderTitleText" aria-hidden="true" class="text-center" style="color: rgb(247 223 187)" :style="{ fontSize: titleFontSize + 'em' }">{{ titleCleaned }}</p>
           </div>
         </div>
         <div cy-id="placeholderAuthor" v-if="!hasCover" class="absolute left-0 right-0 w-full flex items-center justify-center" :style="{ padding: placeholderCoverPadding + 'em', bottom: authorBottom + 'em' }">
-          <p cy-id="placeholderAuthorText" class="text-center" style="color: rgb(247 223 187); opacity: 0.75" :style="{ fontSize: authorFontSize + 'em' }">{{ authorCleaned }}</p>
+          <p cy-id="placeholderAuthorText" aria-hidden="true" class="text-center" style="color: rgb(247 223 187); opacity: 0.75" :style="{ fontSize: authorFontSize + 'em' }">{{ authorCleaned }}</p>
         </div>
 
         <div v-if="seriesSequenceList" class="absolute rounded-lg bg-black bg-opacity-90 box-shadow-md z-20 text-right" :style="{ top: 0.375 + 'em', right: 0.375 + 'em', padding: `${0.1}em ${0.25}em` }" style="background-color: #78350f">
@@ -93,11 +93,11 @@
 
         <!-- rss feed icon -->
         <div cy-id="rssFeed" v-if="rssFeed && !isSelectionMode && !isHovering" class="absolute text-success top-0 left-0 z-10" :style="{ padding: 0.375 + 'em' }">
-          <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">rss_feed</span>
+          <span class="material-symbols" aria-hidden="true" :style="{ fontSize: 1.5 + 'em' }">rss_feed</span>
         </div>
         <!-- media item shared icon -->
         <div cy-id="mediaItemShare" v-if="mediaItemShare && !isSelectionMode && !isHovering" class="absolute text-success left-0 z-10" :style="{ padding: 0.375 + 'em', top: rssFeed ? '2em' : '0px' }">
-          <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">public</span>
+          <span class="material-symbols" aria-hidden="true" :style="{ fontSize: 1.5 + 'em' }">public</span>
         </div>
 
         <!-- Series sequence -->
@@ -114,7 +114,7 @@
 
         <!-- Podcast Num Episodes -->
         <div cy-id="numEpisodes" v-else-if="!numEpisodesIncomplete && numEpisodes && !isHovering && !isSelectionMode" class="absolute rounded-full bg-black bg-opacity-90 box-shadow-md z-10 flex items-center justify-center" :style="{ top: 0.375 + 'em', right: 0.375 + 'em', width: 1.25 + 'em', height: 1.25 + 'em' }">
-          <p :style="{ fontSize: 0.8 + 'em' }">{{ numEpisodes }}</p>
+          <p :style="{ fontSize: 0.8 + 'em' }" role="status" :aria-label="$strings.LabelNumberOfEpisodes">{{ numEpisodes }}</p>
         </div>
 
         <!-- Podcast Num Episodes -->
@@ -128,7 +128,7 @@
     <div cy-id="detailBottom" :id="`description-area-${index}`" v-if="isAlternativeBookshelfView || isAuthorBookshelfView" dir="auto" class="relative mt-2e mb-2e left-0 z-50 w-full">
       <div :style="{ fontSize: 0.9 + 'em' }">
         <ui-tooltip v-if="displayTitle" :text="displayTitle" :disabled="!displayTitleTruncated" direction="bottom" :delayOnShow="500" class="flex items-center">
-          <p cy-id="title" ref="displayTitle" class="truncate">{{ displayTitle }}</p>
+          <p cy-id="title" ref="displayTitle" aria-hidden="true" class="truncate">{{ displayTitle }}</p>
           <widgets-explicit-indicator cy-id="explicitIndicator" v-if="isExplicit" />
         </ui-tooltip>
       </div>
@@ -138,7 +138,7 @@
       <p cy-id="line2" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displayLineTwo || '&nbsp;' }}</p>
       <p cy-id="line3" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p>
     </div>
-  </div>
+  </article>
 </template>
 
 <script>
diff --git a/client/components/cards/LazyCollectionCard.vue b/client/components/cards/LazyCollectionCard.vue
index 2c12ede42..0bb7ac6b8 100644
--- a/client/components/cards/LazyCollectionCard.vue
+++ b/client/components/cards/LazyCollectionCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="card" :id="`collection-card-${index}`" :style="{ width: cardWidth + 'px' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div ref="card" :id="`collection-card-${index}`" role="button" :style="{ width: cardWidth + 'px' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden">
diff --git a/client/components/cards/LazyPlaylistCard.vue b/client/components/cards/LazyPlaylistCard.vue
index a2a2f4619..b49ef4b96 100644
--- a/client/components/cards/LazyPlaylistCard.vue
+++ b/client/components/cards/LazyPlaylistCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="card" :id="`playlist-card-${index}`" :style="{ width: cardWidth + 'px', fontSize: sizeMultiplier + 'rem' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <div ref="card" :id="`playlist-card-${index}`" role="button" :style="{ width: cardWidth + 'px', fontSize: sizeMultiplier + 'rem' }" class="absolute top-0 left-0 rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden">
diff --git a/client/components/cards/LazySeriesCard.vue b/client/components/cards/LazySeriesCard.vue
index 177ec5f3c..57d2a4f84 100644
--- a/client/components/cards/LazySeriesCard.vue
+++ b/client/components/cards/LazySeriesCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div cy-id="card" ref="card" :id="`series-card-${index}`" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
+  <article cy-id="card" ref="card" :id="`series-card-${index}`" tabindex="0" :aria-label="displayTitle" :style="{ width: cardWidth + 'px' }" class="absolute rounded-sm z-30 cursor-pointer" @mousedown.prevent @mouseup.prevent @mousemove.prevent @mouseover="mouseover" @mouseleave="mouseleave" @click="clickCard">
     <div cy-id="covers-area" class="relative" :style="{ height: coverHeight + 'px' }">
       <div class="absolute top-0 left-0 w-full box-shadow-book shadow-height" />
       <div class="w-full h-full bg-primary relative rounded overflow-hidden z-0">
@@ -7,12 +7,12 @@
       </div>
 
       <div cy-id="seriesLengthMarker" class="absolute rounded-lg bg-black bg-opacity-90 box-shadow-md z-20" :style="{ top: 0.375 + 'em', right: 0.375 + 'em', padding: `0.1em 0.25em` }" style="background-color: #cd9d49dd">
-        <p :style="{ fontSize: 0.8 + 'em' }">{{ books.length }}</p>
+        <p :style="{ fontSize: 0.8 + 'em' }" role="status" :aria-label="$strings.LabelNumberOfBooks">{{ books.length }}</p>
       </div>
 
       <div cy-id="seriesProgressBar" v-if="seriesPercentInProgress > 0" class="absolute bottom-0 left-0 h-1e shadow-sm max-w-full z-10 rounded-b w-full" :class="isSeriesFinished ? 'bg-success' : 'bg-yellow-400'" :style="{ width: seriesPercentInProgress * 100 + '%' }" />
 
-      <div cy-id="hoveringDisplayTitle" v-if="hasValidCovers" class="bg-black bg-opacity-60 absolute top-0 left-0 w-full h-full flex items-center justify-center text-center transition-opacity" :class="isHovering ? '' : 'opacity-0'" :style="{ padding: '1em' }">
+      <div cy-id="hoveringDisplayTitle" v-if="hasValidCovers" aria-hidden="true" class="bg-black bg-opacity-60 absolute top-0 left-0 w-full h-full flex items-center justify-center text-center transition-opacity" :class="isHovering ? '' : 'opacity-0'" :style="{ padding: '1em' }">
         <p :style="{ fontSize: 1.2 + 'em' }">{{ displayTitle }}</p>
       </div>
 
@@ -21,14 +21,14 @@
 
     <div cy-id="standardBottomText" v-if="!isAlternativeBookshelfView" class="categoryPlacard absolute z-10 left-0 right-0 mx-auto -bottom-6e h-6e rounded-md text-center" :style="{ width: Math.min(200, cardWidth) + 'px' }">
       <div class="w-full h-full shinyBlack flex items-center justify-center rounded-sm border" :style="{ padding: `0em 0.5em` }">
-        <p cy-id="standardBottomDisplayTitle" class="truncate" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
+        <p cy-id="standardBottomDisplayTitle" class="truncate" aria-hidden="true" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
       </div>
     </div>
     <div cy-id="detailBottomText" v-else class="relative z-30 left-0 right-0 mx-auto py-1e rounded-md text-center">
-      <p cy-id="detailBottomDisplayTitle" class="truncate" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
+      <p cy-id="detailBottomDisplayTitle" class="truncate" aria-hidden="true" :style="{ fontSize: labelFontSize + 'em' }">{{ displayTitle }}</p>
       <p cy-id="detailBottomSortLine" v-if="displaySortLine" class="truncate text-gray-400" :style="{ fontSize: 0.8 + 'em' }">{{ displaySortLine }}</p>
     </div>
-  </div>
+  </article>
 </template>
 
 <script>
diff --git a/client/components/controls/GlobalSearch.vue b/client/components/controls/GlobalSearch.vue
index 58796fded..7691bbfcd 100644
--- a/client/components/controls/GlobalSearch.vue
+++ b/client/components/controls/GlobalSearch.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="">
     <div class="w-full relative sm:w-80">
-      <form @submit.prevent="submitSearch">
+      <form role="search" @submit.prevent="submitSearch">
         <ui-text-input ref="input" v-model="search" :placeholder="$strings.PlaceholderSearch" @input="inputUpdate" @focus="focussed" @blur="blurred" class="w-full h-8 text-sm" />
       </form>
-      <div class="absolute top-0 right-0 bottom-0 h-full flex items-center px-2 text-gray-400 cursor-pointer" @click="clickClear">
+      <button :aria-hidden="!search" class="absolute top-0 right-0 bottom-0 h-full flex items-center px-2 text-gray-400 cursor-pointer" @click="clickClear">
         <span v-if="!search" class="material-symbols" style="font-size: 1.2rem">&#xe8b6;</span>
         <span v-else class="material-symbols" style="font-size: 1.2rem">close</span>
-      </div>
+      </button>
     </div>
     <div v-show="showMenu && (lastSearch || isTyping)" class="absolute z-40 -mt-px w-full max-w-64 sm:max-w-80 sm:w-80 bg-bg border border-black-200 shadow-lg rounded-md py-1 px-2 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm globalSearchMenu" @mousedown.stop.prevent>
       <ul class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
diff --git a/client/components/controls/LibraryFilterSelect.vue b/client/components/controls/LibraryFilterSelect.vue
index 2d9ced5a4..c600d80fb 100644
--- a/client/components/controls/LibraryFilterSelect.vue
+++ b/client/components/controls/LibraryFilterSelect.vue
@@ -1,28 +1,30 @@
 <template>
   <div ref="wrapper" class="relative" v-click-outside="clickOutside">
-    <button type="button" class="relative w-full h-full bg-bg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label" @click.prevent="showMenu = !showMenu">
-      <span class="flex items-center justify-between">
-        <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
-      </span>
+    <div class="relative h-7">
+      <button type="button" class="relative w-full h-full bg-bg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="menu" :aria-expanded="showMenu" @click.prevent="showMenu = !showMenu">
+        <span class="flex items-center justify-between">
+          <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
+        </span>
+      </button>
       <span v-if="selected === 'all'" class="ml-3 absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
         <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
           <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
         </svg>
       </span>
-      <div v-else class="ml-3 absolute inset-y-0 right-0 flex items-center pr-2 cursor-pointer text-gray-400 hover:text-gray-200" @mousedown.stop @mouseup.stop @click.stop.prevent="clearSelected">
+      <button v-else :aria-label="$strings.ButtonClearFilter" class="ml-3 absolute inset-y-0 right-0 flex items-center pr-2 cursor-pointer text-gray-400 hover:text-gray-200" @mousedown.stop @mouseup.stop @click.stop.prevent="clearSelected">
         <span class="material-symbols" style="font-size: 1.1rem">close</span>
-      </div>
-    </button>
+      </button>
+    </div>
 
     <div v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm libraryFilterMenu">
-      <ul v-show="!sublist" class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
+      <ul v-show="!sublist" class="h-full w-full" role="menu">
         <template v-for="item in selectItems">
-          <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedOption(item)">
+          <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" :aria-haspopup="item.sublist ? '' : 'menu'" @click="clickedOption(item)">
             <div class="flex items-center justify-between">
               <span class="font-normal ml-3 block truncate text-sm">{{ item.text }}</span>
             </div>
             <div v-if="item.sublist" class="absolute right-1 top-0 bottom-0 h-full flex items-center">
-              <span class="material-symbols text-2xl">arrow_right</span>
+              <span class="material-symbols text-2xl" :aria-label="$strings.LabelMore">arrow_right</span>
             </div>
             <!-- selected checkmark icon -->
             <div v-if="item.value === selected" class="absolute inset-y-0 right-2 h-full flex items-center pointer-events-none">
@@ -31,8 +33,8 @@
           </li>
         </template>
       </ul>
-      <ul v-show="sublist" class="h-full w-full" role="listbox" aria-labelledby="listbox-label">
-        <li class="text-gray-50 select-none relative py-2 pl-9 cursor-pointer hover:bg-white/5" role="option" @click="sublist = null">
+      <ul v-show="sublist" class="h-full w-full" role="menu">
+        <li class="text-gray-50 select-none relative py-2 pl-9 cursor-pointer hover:bg-white/5" role="menuitem" @click="sublist = null">
           <div class="absolute left-1 top-0 bottom-0 h-full flex items-center">
             <span class="material-symbols text-2xl">arrow_left</span>
           </div>
@@ -40,13 +42,13 @@
             <span class="font-normal block truncate">{{ $strings.ButtonBack }}</span>
           </div>
         </li>
-        <li v-if="!sublistItems.length" class="text-gray-400 select-none relative px-2" role="option">
+        <li v-if="!sublistItems.length" class="text-gray-400 select-none relative px-2" role="menuitem">
           <div class="flex items-center justify-center">
             <span class="font-normal block truncate py-2">{{ $getString('LabelLibraryFilterSublistEmpty', [selectedSublistText]) }}</span>
           </div>
         </li>
         <template v-for="item in sublistItems">
-          <li :key="item.value" class="select-none relative px-2 cursor-pointer hover:bg-white/5" :class="`${sublist}.${item.value}` === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedSublistOption(item.value)">
+          <li :key="item.value" class="select-none relative px-2 cursor-pointer hover:bg-white/5" :class="`${sublist}.${item.value}` === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" @click="clickedSublistOption(item.value)">
             <div class="flex items-center">
               <span class="font-normal truncate py-2 text-xs">{{ item.text }}</span>
             </div>
diff --git a/client/components/controls/LibrarySortSelect.vue b/client/components/controls/LibrarySortSelect.vue
index 0524f54c0..8a297f0d0 100644
--- a/client/components/controls/LibrarySortSelect.vue
+++ b/client/components/controls/LibrarySortSelect.vue
@@ -1,20 +1,20 @@
 <template>
   <div ref="wrapper" class="relative" v-click-outside="clickOutside">
-    <button type="button" class="relative w-full h-full bg-fg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label" @click.prevent="showMenu = !showMenu">
+    <button type="button" class="relative w-full h-full bg-fg border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none sm:text-sm cursor-pointer" aria-haspopup="menu" :aria-expanded="showMenu" @click.prevent="showMenu = !showMenu">
       <span class="flex items-center justify-between">
         <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
-        <span class="material-symbols text-lg text-yellow-400">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+        <span class="material-symbols text-lg text-yellow-400" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
       </span>
     </button>
 
-    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-96 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="listbox" aria-labelledby="listbox-label">
+    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-96 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="menu">
       <template v-for="item in selectItems">
-        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedOption(item.value)">
+        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" @click="clickedOption(item.value)">
           <div class="flex items-center">
             <span class="font-normal ml-3 block truncate">{{ item.text }}</span>
           </div>
           <span v-if="item.value === selected" class="text-yellow-400 absolute inset-y-0 right-0 flex items-center pr-4">
-            <span class="material-symbols text-xl">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+            <span class="material-symbols text-xl" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
           </span>
         </li>
       </template>
diff --git a/client/components/controls/SortSelect.vue b/client/components/controls/SortSelect.vue
index bd16dd876..967cf071a 100644
--- a/client/components/controls/SortSelect.vue
+++ b/client/components/controls/SortSelect.vue
@@ -1,20 +1,20 @@
 <template>
   <div ref="wrapper" class="relative" v-click-outside="clickOutside">
-    <button type="button" class="relative w-full h-full border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none cursor-pointer" aria-haspopup="listbox" aria-expanded="true" aria-labelledby="listbox-label" @click.prevent="showMenu = !showMenu">
+    <button type="button" class="relative w-full h-full border border-gray-500 hover:border-gray-400 rounded shadow-sm pl-3 pr-3 py-0 text-left focus:outline-none cursor-pointer" aria-haspopup="menu" :aria-expanded="showMenu" @click.prevent="showMenu = !showMenu">
       <span class="flex items-center justify-between">
         <span class="block truncate text-xs" :class="!selectedText ? 'text-gray-300' : ''">{{ selectedText }}</span>
-        <span class="material-symbols text-lg text-yellow-400">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+        <span class="material-symbols text-lg text-yellow-400" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
       </span>
     </button>
 
-    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-80 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="listbox" aria-labelledby="listbox-label">
+    <ul v-show="showMenu" class="absolute z-10 mt-1 w-full bg-bg border border-black-200 shadow-lg max-h-80 rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none text-sm" role="menu">
       <template v-for="item in items">
-        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="option" @click="clickedOption(item.value)">
+        <li :key="item.value" class="select-none relative py-2 pr-9 cursor-pointer hover:bg-white/5" :class="item.value === selected ? 'bg-white/5 text-yellow-400' : 'text-gray-200 hover:text-white'" role="menuitem" @click="clickedOption(item.value)">
           <div class="flex items-center">
             <span class="font-normal ml-3 block truncate">{{ item.text }}</span>
           </div>
           <span v-if="item.value === selected" class="text-yellow-400 absolute inset-y-0 right-0 flex items-center pr-4">
-            <span class="material-symbols text-xl">{{ descending ? 'expand_more' : 'expand_less' }}</span>
+            <span class="material-symbols text-xl" :aria-label="descending ? $strings.LabelSortDescending : $strings.LabelSortAscending">{{ descending ? 'expand_more' : 'expand_less' }}</span>
           </span>
         </li>
       </template>
diff --git a/client/components/covers/GroupCover.vue b/client/components/covers/GroupCover.vue
index 2c7872e97..4f2137211 100644
--- a/client/components/covers/GroupCover.vue
+++ b/client/components/covers/GroupCover.vue
@@ -121,6 +121,8 @@ export default {
 
       var img = document.createElement('img')
       img.src = src
+      img.alt = `${this.name}, ${this.$strings.LabelCover}`
+      img.ariaHidden = true
       img.className = 'absolute top-0 left-0 w-full h-full'
       img.style.objectFit = showCoverBg ? 'contain' : 'cover'
 
diff --git a/client/components/modals/Modal.vue b/client/components/modals/Modal.vue
index ca00c7c53..382377459 100644
--- a/client/components/modals/Modal.vue
+++ b/client/components/modals/Modal.vue
@@ -1,12 +1,12 @@
 <template>
-  <div ref="wrapper" class="modal modal-bg w-full h-full fixed top-0 left-0 bg-primary items-center justify-center opacity-0 hidden" :class="`z-${zIndex} bg-opacity-${bgOpacity}`">
+  <div ref="wrapper" role="dialog" aria-modal="true" class="modal modal-bg w-full h-full fixed top-0 left-0 bg-primary items-center justify-center opacity-0 hidden" :class="`z-${zIndex} bg-opacity-${bgOpacity}`">
     <div class="absolute top-0 left-0 right-0 w-full h-36 bg-gradient-to-t from-transparent via-black-500 to-black-700 opacity-90 pointer-events-none" />
 
     <button class="absolute top-4 right-4 landscape:top-4 landscape:right-4 md:portrait:top-5 md:portrait:right-5 lg:top-5 lg:right-5 inline-flex text-gray-200 hover:text-white" aria-label="Close modal" @click="clickClose">
       <span class="material-symbols text-2xl landscape:text-2xl md:portrait:text-4xl lg:text-4xl">close</span>
     </button>
     <slot name="outer" />
-    <div ref="content" style="min-width: 380px; min-height: 200px; max-width: 100vw" class="relative text-white" aria-modal="true" :style="{ height: modalHeight, width: modalWidth, marginTop: contentMarginTop + 'px' }" @mousedown="mousedownModal" @mouseup="mouseupModal" v-click-outside="clickBg">
+    <div ref="content" tabindex="0" style="min-width: 380px; min-height: 200px; max-width: 100vw" class="relative text-white outline-none" :style="{ height: modalHeight, width: modalWidth, marginTop: contentMarginTop + 'px' }" @mousedown="mousedownModal" @mouseup="mouseupModal" v-click-outside="clickBg">
       <slot />
       <div v-if="processing" class="absolute top-0 left-0 right-0 bottom-0 w-full h-full bg-black bg-opacity-60 rounded-lg flex items-center justify-center">
         <ui-loading-indicator />
@@ -126,6 +126,9 @@ export default {
 
       this.$eventBus.$on('modal-hotkey', this.hotkey)
       this.$store.commit('setOpenModal', this.name)
+
+      // Set focus to the modal content
+      this.content.focus()
     },
     setHide() {
       if (this.content) this.content.style.transform = 'scale(0)'
diff --git a/client/components/modals/changelog/ViewModal.vue b/client/components/modals/changelog/ViewModal.vue
index 6ff0e0674..855fb6f8c 100644
--- a/client/components/modals/changelog/ViewModal.vue
+++ b/client/components/modals/changelog/ViewModal.vue
@@ -2,7 +2,7 @@
   <modals-modal v-model="show" name="changelog" :width="800" :height="'unset'">
     <template #outer>
       <div class="absolute top-0 left-0 p-5 w-2/3 overflow-hidden">
-        <p class="text-3xl text-white truncate">Changelog</p>
+        <h1 class="text-3xl text-white truncate">Changelog</h1>
       </div>
     </template>
     <div class="px-8 py-6 w-full rounded-lg bg-bg shadow-lg border border-black-300 relative overflow-y-scroll" style="max-height: 80vh">
@@ -13,7 +13,7 @@
           </p>
           <div class="custom-text" v-html="getChangelog(release)" />
         </div>
-        <div v-if="release !== releasesToShow[releasesToShow.length - 1]" class="border-b border-black-300 my-8" />
+        <div v-if="release !== releasesToShow[releasesToShow.length - 1]" :key="`${release.name}-divider`" class="border-b border-black-300 my-8" />
       </template>
     </div>
   </modals-modal>
diff --git a/client/components/stats/YearInReview.vue b/client/components/stats/YearInReview.vue
index 56840b9c8..ed8b800ce 100644
--- a/client/components/stats/YearInReview.vue
+++ b/client/components/stats/YearInReview.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <div v-if="processing" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
+    <div v-if="processing" role="img" :aria-label="$strings.MessageLoading" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
       <widgets-loading-spinner />
     </div>
-    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" />
+    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" :aria-label="$getString('LabelPersonalYearReview', [variant + 1])" />
   </div>
 </template>
 
diff --git a/client/components/stats/YearInReviewBanner.vue b/client/components/stats/YearInReviewBanner.vue
index cf98d5cbb..d3191acbc 100644
--- a/client/components/stats/YearInReviewBanner.vue
+++ b/client/components/stats/YearInReviewBanner.vue
@@ -7,7 +7,7 @@
     </div>
 
     <div class="flex items-center">
-      <p class="hidden md:block text-xl font-semibold">{{ $getString('HeaderYearReview', [yearInReviewYear]) }}</p>
+      <h1 class="hidden md:block text-xl font-semibold">{{ $getString('HeaderYearReview', [yearInReviewYear]) }}</h1>
       <div class="hidden md:block flex-grow" />
       <ui-btn class="w-full md:w-auto" @click.stop="clickShowYearInReview">{{ showYearInReview ? $strings.LabelYearReviewHide : $strings.LabelYearReviewShow }}</ui-btn>
     </div>
@@ -16,17 +16,22 @@
     <div v-if="showYearInReview">
       <div class="w-full h-px bg-slate-200/10 my-4" />
 
-      <div class="flex items-center justify-center mb-2 max-w-[800px] mx-auto">
+      <div v-if="availableYears.length > 1" class="mb-2 py-2 max-w-[800px] mx-auto">
+        <!-- year selector -->
+        <ui-dropdown v-model="yearInReviewYear" small :items="availableYears" :disabled="processingYearInReview" class="max-w-24" @input="yearInReviewYearChanged" />
+      </div>
+
+      <div role="toolbar" class="flex items-center justify-center mb-2 max-w-[800px] mx-auto">
         <!-- previous button -->
-        <ui-btn small :disabled="!yearInReviewVariant || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant--">
+        <ui-btn small :disabled="!yearInReviewVariant || processingYearInReview" :aria-label="$strings.ButtonPrevious" class="inline-flex items-center font-semibold" @click="yearInReviewVariant--">
           <span class="material-symbols text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
           <span class="hidden sm:inline-block pr-2">{{ $strings.ButtonPrevious }}</span>
         </ui-btn>
         <!-- share button -->
-        <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview">{{ $strings.ButtonShare }} </ui-btn>
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReview" class="inline-flex items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReview">{{ $strings.ButtonShare }} </ui-btn>
 
         <div class="flex-grow" />
-        <p class="hidden sm:block text-lg font-semibold">{{ $getString('LabelPersonalYearReview', [yearInReviewVariant + 1]) }}</p>
+        <h2 class="hidden sm:block text-lg font-semibold">{{ $getString('LabelPersonalYearReview', [yearInReviewVariant + 1]) }}</h2>
         <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewVariant + 1 }}</p>
         <div class="flex-grow" />
 
@@ -36,7 +41,7 @@
           <span class="material-symbols sm:!hidden text-lg py-px">refresh</span>
         </ui-btn>
         <!-- next button -->
-        <ui-btn small :disabled="yearInReviewVariant >= 2 || processingYearInReview" class="inline-flex items-center font-semibold" @click="yearInReviewVariant++">
+        <ui-btn small :disabled="yearInReviewVariant >= 2 || processingYearInReview" :aria-label="$strings.ButtonNext" class="inline-flex items-center font-semibold" @click="yearInReviewVariant++">
           <span class="hidden sm:inline-block pl-2">{{ $strings.ButtonNext }}</span>
           <span class="material-symbols text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
         </ui-btn>
@@ -46,23 +51,23 @@
       <!-- your year in review short -->
       <div class="w-full max-w-[800px] mx-auto my-4">
         <!-- share button -->
-        <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewShort" class="inline-flex sm:hidden items-center font-semibold mb-1" @click="shareYearInReviewShort">{{ $strings.ButtonShare }}</ui-btn>
+        <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewShort" class="inline-flex items-center font-semibold mb-1" @click="shareYearInReviewShort">{{ $strings.ButtonShare }}</ui-btn>
         <stats-year-in-review-short ref="yearInReviewShort" :year="yearInReviewYear" :processing.sync="processingYearInReviewShort" />
       </div>
 
       <!-- your server in review -->
-      <div v-if="isAdminOrUp" class="w-full max-w-[800px] mx-auto mb-2 mt-4 border-t pt-4 border-white/10">
+      <div v-if="isAdminOrUp" role="toolbar" class="w-full max-w-[800px] mx-auto mb-2 mt-4 border-t pt-4 border-white/10">
         <div class="flex items-center justify-center mb-2">
           <!-- previous button -->
-          <ui-btn small :disabled="!yearInReviewServerVariant || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant--">
+          <ui-btn small :disabled="!yearInReviewServerVariant || processingYearInReviewServer" :aria-label="$strings.ButtonPrevious" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant--">
             <span class="material-symbols text-lg sm:pr-1 py-px sm:py-0">chevron_left</span>
             <span class="hidden sm:inline-block pr-2">{{ $strings.ButtonPrevious }}</span>
           </ui-btn>
           <!-- share button -->
-          <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex sm:hidden items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer">{{ $strings.ButtonShare }} </ui-btn>
+          <ui-btn v-if="showShareButton" small :disabled="processingYearInReviewServer" class="inline-flex items-center font-semibold ml-1 sm:ml-2" @click="shareYearInReviewServer">{{ $strings.ButtonShare }} </ui-btn>
 
           <div class="flex-grow" />
-          <p class="hidden sm:block text-lg font-semibold">{{ $getString('LabelServerYearReview', [yearInReviewServerVariant + 1]) }}</p>
+          <h2 class="hidden sm:block text-lg font-semibold">{{ $getString('LabelServerYearReview', [yearInReviewServerVariant + 1]) }}</h2>
           <p class="block sm:hidden text-lg font-semibold">{{ yearInReviewServerVariant + 1 }}</p>
           <div class="flex-grow" />
 
@@ -72,7 +77,7 @@
             <span class="material-symbols sm:!hidden text-lg py-px">refresh</span>
           </ui-btn>
           <!-- next button -->
-          <ui-btn small :disabled="yearInReviewServerVariant >= 2 || processingYearInReviewServer" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant++">
+          <ui-btn small :disabled="yearInReviewServerVariant >= 2 || processingYearInReviewServer" :aria-label="$strings.ButtonNext" class="inline-flex items-center font-semibold" @click="yearInReviewServerVariant++">
             <span class="hidden sm:inline-block pl-2">{{ $strings.ButtonNext }}</span>
             <span class="material-symbols text-lg sm:pl-1 py-px sm:py-0">chevron_right</span>
           </ui-btn>
@@ -88,6 +93,7 @@ export default {
   data() {
     return {
       showYearInReview: false,
+      availableYears: [],
       yearInReviewYear: 0,
       yearInReviewVariant: 0,
       yearInReviewServerVariant: 0,
@@ -100,6 +106,9 @@ export default {
   computed: {
     isAdminOrUp() {
       return this.$store.getters['user/getIsAdminOrUp']
+    },
+    user() {
+      return this.$store.state.user.user
     }
   },
   methods: {
@@ -112,25 +121,57 @@ export default {
     shareYearInReviewShort() {
       this.$refs.yearInReviewShort.share()
     },
+    yearInReviewYearChanged() {
+      this.$nextTick(() => {
+        this.refreshYearInReview()
+        this.refreshYearInReviewServer()
+      })
+    },
     refreshYearInReviewServer() {
-      this.$refs.yearInReviewServer.refresh()
+      if (this.$refs.yearInReviewServer != null) {
+        this.$refs.yearInReviewServer.refresh()
+      }
     },
     refreshYearInReview() {
-      this.$refs.yearInReview.refresh()
-      this.$refs.yearInReviewShort.refresh()
+      if (this.$refs.yearInReview != null && this.$refs.yearInReviewShort != null) {
+        this.$refs.yearInReview.refresh()
+        this.$refs.yearInReviewShort.refresh()
+      }
     },
     clickShowYearInReview() {
       this.showYearInReview = !this.showYearInReview
+    },
+    getAvailableYears() {
+      if (this.user) {
+        const oldestDate = this.user.createdAt
+        if (oldestDate) {
+          const date = new Date(oldestDate)
+          const oldestYear = date.getFullYear()
+          const currentYear = new Date().getFullYear()
+
+          const years = []
+          for (let year = currentYear; year >= oldestYear; year--) {
+            years.push({ value: year, text: year.toString() })
+          }
+
+          return years
+        }
+      }
+      // Fallback on error
+      return [{ value: this.yearInReviewYear, text: this.yearInReviewYear.toString() }]
     }
   },
   beforeMount() {
     this.yearInReviewYear = new Date().getFullYear()
+
     // When not December show previous year
     if (new Date().getMonth() < 11) {
       this.yearInReviewYear--
     }
   },
   mounted() {
+    this.availableYears = this.getAvailableYears()
+
     if (typeof navigator.share !== 'undefined' && navigator.share) {
       this.showShareButton = true
     } else {
diff --git a/client/components/stats/YearInReviewServer.vue b/client/components/stats/YearInReviewServer.vue
index 05bc09103..ecdcf1b9e 100644
--- a/client/components/stats/YearInReviewServer.vue
+++ b/client/components/stats/YearInReviewServer.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <div v-if="processing" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
+    <div v-if="processing" role="img" :aria-label="$strings.MessageLoading" class="max-w-[800px] h-80 md:h-[800px] mx-auto flex items-center justify-center">
       <widgets-loading-spinner />
     </div>
-    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" />
+    <img v-else-if="dataUrl" :src="dataUrl" class="mx-auto" :aria-label="$getString('LabelServerYearReview', [variant + 1])" />
   </div>
 </template>
 
diff --git a/client/components/ui/ContextMenuDropdown.vue b/client/components/ui/ContextMenuDropdown.vue
index e6dce4fba..52a5c2e2b 100644
--- a/client/components/ui/ContextMenuDropdown.vue
+++ b/client/components/ui/ContextMenuDropdown.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative h-9 w-9" v-click-outside="clickOutsideObj">
     <slot :disabled="disabled" :showMenu="showMenu" :clickShowMenu="clickShowMenu" :processing="processing">
-      <button v-if="!processing" type="button" :disabled="disabled" class="relative h-full w-full flex items-center justify-center shadow-sm pl-3 pr-3 text-left focus:outline-none cursor-pointer text-gray-100 hover:text-gray-200 rounded-full hover:bg-white/5" aria-haspopup="listbox" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
+      <button v-if="!processing" type="button" :disabled="disabled" class="relative h-full w-full flex items-center justify-center shadow-sm pl-3 pr-3 text-left focus:outline-none cursor-pointer text-gray-100 hover:text-gray-200 rounded-full hover:bg-white/5" :aria-label="$strings.LabelMore" aria-haspopup="menu" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
         <span class="material-symbols text-2xl" :class="iconClass">&#xe5d4;</span>
       </button>
       <div v-else class="h-full w-full flex items-center justify-center">
@@ -10,12 +10,12 @@
     </slot>
 
     <transition name="menu">
-      <div v-show="showMenu" ref="menuWrapper" class="absolute right-0 mt-1 z-10 bg-bg border border-black-200 shadow-lg rounded-md py-1 focus:outline-none sm:text-sm" :style="{ width: menuWidth + 'px' }">
+      <div v-show="showMenu" ref="menuWrapper" role="menu" class="absolute right-0 mt-1 z-10 bg-bg border border-black-200 shadow-lg rounded-md py-1 focus:outline-none sm:text-sm" :style="{ width: menuWidth + 'px' }">
         <template v-for="(item, index) in items">
           <template v-if="item.subitems">
-            <div :key="index" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-default" :class="{ 'bg-white/5': mouseoverItemIndex == index }" @mouseover="mouseoverItem(index)" @mouseleave="mouseleaveItem(index)" @click.stop>
+            <button :key="index" role="menuitem" aria-haspopup="menu" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-default w-full" :class="{ 'bg-white/5': mouseoverItemIndex == index }" @mouseover="mouseoverItem(index)" @mouseleave="mouseleaveItem(index)" @click.stop>
               <p>{{ item.text }}</p>
-            </div>
+            </button>
             <div
               v-if="mouseoverItemIndex === index"
               :key="`subitems-${index}`"
@@ -25,14 +25,14 @@
               :class="openSubMenuLeft ? 'rounded-l-md' : 'rounded-r-md'"
               :style="{ left: submenuLeftPos + 'px', top: index * 28 + 'px', width: submenuWidth + 'px' }"
             >
-              <div v-for="(subitem, subitemindex) in item.subitems" :key="`subitem-${subitemindex}`" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer" @click.stop="clickAction(subitem.action, subitem.data)">
+              <button v-for="(subitem, subitemindex) in item.subitems" :key="`subitem-${subitemindex}`" role="menuitem" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer w-full" @click.stop="clickAction(subitem.action, subitem.data)">
                 <p>{{ subitem.text }}</p>
-              </div>
+              </button>
             </div>
           </template>
-          <div v-else :key="index" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer" @click.stop="clickAction(item.action)">
+          <button v-else :key="index" role="menuitem" class="flex items-center px-2 py-1.5 hover:bg-white/5 text-white text-xs cursor-pointer w-full" @click.stop="clickAction(item.action)">
             <p class="text-left">{{ item.text }}</p>
-          </div>
+          </button>
         </template>
       </div>
     </transition>
diff --git a/client/components/ui/Dropdown.vue b/client/components/ui/Dropdown.vue
index 3c142686f..3e7af46fc 100644
--- a/client/components/ui/Dropdown.vue
+++ b/client/components/ui/Dropdown.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative w-full" v-click-outside="clickOutsideObj">
     <p v-if="label" class="text-sm font-semibold px-1" :class="disabled ? 'text-gray-300' : ''">{{ label }}</p>
-    <button type="button" :aria-label="longLabel" :disabled="disabled" class="relative w-full border rounded shadow-sm pl-3 pr-8 py-2 text-left sm:text-sm" :class="buttonClass" aria-haspopup="listbox" aria-expanded="true" @click.stop.prevent="clickShowMenu">
+    <button type="button" :aria-label="longLabel" :disabled="disabled" class="relative w-full border rounded shadow-sm pl-3 pr-8 py-2 text-left sm:text-sm" :class="buttonClass" aria-haspopup="menu" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
       <span class="flex items-center">
         <span class="block truncate font-sans" :class="{ 'font-semibold': selectedSubtext, 'text-sm': small }">{{ selectedText }}</span>
         <span v-if="selectedSubtext">:&nbsp;</span>
@@ -13,9 +13,9 @@
     </button>
 
     <transition name="menu">
-      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto sm:text-sm" tabindex="-1" role="listbox" :style="{ maxHeight: menuMaxHeight }">
+      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full bg-primary border border-black-200 shadow-lg rounded-md py-1 ring-1 ring-black ring-opacity-5 overflow-auto sm:text-sm" tabindex="-1" role="menu" :style="{ maxHeight: menuMaxHeight }">
         <template v-for="item in itemsToShow">
-          <li :key="item.value" class="text-gray-100 relative py-2 cursor-pointer hover:bg-black-400" :id="'listbox-option-' + item.value" role="option" tabindex="0" @keyup.enter="clickedOption(item.value)" @click="clickedOption(item.value)">
+          <li :key="item.value" class="text-gray-100 relative py-2 cursor-pointer hover:bg-black-400" role="menuitem" tabindex="0" @keyup.enter="clickedOption(item.value)" @click="clickedOption(item.value)">
             <div class="flex items-center">
               <span class="ml-3 block truncate font-sans text-sm" :class="{ 'font-semibold': item.subtext }">{{ item.text }}</span>
               <span v-if="item.subtext">:&nbsp;</span>
@@ -119,4 +119,4 @@ export default {
   },
   mounted() {}
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/client/components/ui/IconBtn.vue b/client/components/ui/IconBtn.vue
index 05039b8dc..2b0dcd656 100644
--- a/client/components/ui/IconBtn.vue
+++ b/client/components/ui/IconBtn.vue
@@ -1,5 +1,5 @@
 <template>
-  <button class="icon-btn rounded-md flex items-center justify-center relative" @mousedown.prevent :disabled="disabled || loading" :class="className" @click="clickBtn">
+  <button :aria-label="ariaLabel" class="icon-btn rounded-md flex items-center justify-center relative" @mousedown.prevent :disabled="disabled || loading" :class="className" @click="clickBtn">
     <div v-if="loading" class="text-white absolute top-0 left-0 w-full h-full flex items-center justify-center text-opacity-100">
       <svg class="animate-spin" style="width: 24px; height: 24px" viewBox="0 0 24 24">
         <path fill="currentColor" d="M12,4V2A10,10 0 0,0 2,12H4A8,8 0 0,1 12,4Z" />
@@ -28,7 +28,8 @@ export default {
     size: {
       type: Number,
       default: 9
-    }
+    },
+    ariaLabel: String
   },
   data() {
     return {}
diff --git a/client/components/ui/LibrariesDropdown.vue b/client/components/ui/LibrariesDropdown.vue
index 7fea2dcb7..a3eeaaf28 100644
--- a/client/components/ui/LibrariesDropdown.vue
+++ b/client/components/ui/LibrariesDropdown.vue
@@ -4,7 +4,7 @@
       type="button"
       :disabled="disabled"
       class="w-10 sm:w-full relative h-full border border-white border-opacity-10 hover:border-opacity-20 rounded shadow-sm px-2 text-left text-sm cursor-pointer bg-black bg-opacity-20 text-gray-400 hover:text-gray-200"
-      aria-haspopup="listbox"
+      aria-haspopup="menu"
       :aria-expanded="showMenu"
       :aria-label="$strings.ButtonLibrary + ': ' + currentLibrary.name"
       @click.stop.prevent="clickShowMenu"
@@ -16,9 +16,9 @@
     </button>
 
     <transition name="menu">
-      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full min-w-48 bg-primary border border-black-200 shadow-lg rounded-b-md py-1 overflow-auto focus:outline-none sm:text-sm librariesDropdownMenu" tabindex="-1" role="listbox">
+      <ul v-show="showMenu" class="absolute z-10 -mt-px w-full min-w-48 bg-primary border border-black-200 shadow-lg rounded-b-md py-1 overflow-auto focus:outline-none sm:text-sm librariesDropdownMenu" tabindex="-1" role="menu">
         <template v-for="library in librariesFiltered">
-          <li :key="library.id" class="text-gray-400 hover:text-white relative py-2 cursor-pointer hover:bg-black-400" role="option" tabindex="0" @keydown.enter="selectLibrary(library)" @click="selectLibrary(library)">
+          <li :key="library.id" class="text-gray-400 hover:text-white relative py-2 cursor-pointer hover:bg-black-400" role="menuitem" tabindex="0" @keydown.enter="selectLibrary(library)" @click="selectLibrary(library)">
             <div class="flex items-center px-2">
               <ui-library-icon :icon="library.icon" class="mr-1.5" />
               <span class="font-normal block truncate font-sans text-sm">{{ library.name }}</span>
diff --git a/client/components/ui/ReadIconBtn.vue b/client/components/ui/ReadIconBtn.vue
index ddbd35418..a6d463542 100644
--- a/client/components/ui/ReadIconBtn.vue
+++ b/client/components/ui/ReadIconBtn.vue
@@ -1,5 +1,5 @@
 <template>
-  <button class="icon-btn rounded-md flex items-center justify-center h-9 w-9 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
+  <button :aria-label="isRead ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" class="icon-btn rounded-md flex items-center justify-center h-9 w-9 relative" :class="borderless ? '' : 'bg-primary border border-gray-600'" @click="clickBtn">
     <div class="w-5 h-5 text-white relative">
       <svg v-if="isRead" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="rgb(63, 181, 68)">
         <path d="M19 1H5c-1.1 0-1.99.9-1.99 2L3 15.93c0 .69.35 1.3.88 1.66L12 23l8.11-5.41c.53-.36.88-.97.88-1.66L21 3c0-1.1-.9-2-2-2zm-9 15l-5-5 1.41-1.41L10 13.17l7.59-7.59L19 7l-9 9z" />
diff --git a/client/components/widgets/CoverSizeWidget.vue b/client/components/widgets/CoverSizeWidget.vue
index 42e60971d..0841e4a03 100644
--- a/client/components/widgets/CoverSizeWidget.vue
+++ b/client/components/widgets/CoverSizeWidget.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="rounded-full py-1 bg-primary px-2 border border-black-100 text-center flex items-center box-shadow-md" @mousedown.prevent @mouseup.prevent>
+    <div aria-hidden="true" class="rounded-full py-1 bg-primary px-2 border border-black-100 text-center flex items-center box-shadow-md" @mousedown.prevent @mouseup.prevent>
       <span class="material-symbols" :class="selectedSizeIndex === 0 ? 'text-gray-400' : 'hover:text-yellow-300 cursor-pointer'" style="font-size: 0.9rem" @mousedown.prevent @click="decreaseSize" aria-label="Decrease Cover Size" role="button">&#xe15b;</span>
       <p class="px-2 font-mono" style="font-size: 1rem">{{ bookCoverWidth }}</p>
       <span class="material-symbols" :class="selectedSizeIndex === availableSizes.length - 1 ? 'text-gray-400' : 'hover:text-yellow-300 cursor-pointer'" style="font-size: 0.9rem" @mousedown.prevent @click="increaseSize" aria-label="Increase Cover Size" role="button">&#xe145;</span>
diff --git a/client/components/widgets/ItemSlider.vue b/client/components/widgets/ItemSlider.vue
index fd14a2024..92639cc62 100644
--- a/client/components/widgets/ItemSlider.vue
+++ b/client/components/widgets/ItemSlider.vue
@@ -3,10 +3,10 @@
     <div class="flex items-center py-3e">
       <slot />
       <div class="flex-grow" />
-      <button cy-id="leftScrollButton" v-if="isScrollable" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollLeft ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollLeft">
+      <button cy-id="leftScrollButton" v-if="isScrollable" :aria-label="$strings.ButtonScrollLeft" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollLeft ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollLeft">
         <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">chevron_left</span>
       </button>
-      <button cy-id="rightScrollButton" v-if="isScrollable" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollRight ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollRight">
+      <button cy-id="rightScrollButton" v-if="isScrollable" :aria-label="$strings.ButtonScrollRight" class="w-8e h-8e mx-1e flex items-center justify-center rounded-full" :class="canScrollRight ? 'hover:bg-white hover:bg-opacity-5 text-gray-300 hover:text-white' : 'text-white text-opacity-40 cursor-text'" @click="scrollRight">
         <span class="material-symbols" :style="{ fontSize: 1.5 + 'em' }">chevron_right</span>
       </button>
     </div>
diff --git a/client/pages/item/_id/index.vue b/client/pages/item/_id/index.vue
index 2e7e601c7..139794e55 100644
--- a/client/pages/item/_id/index.vue
+++ b/client/pages/item/_id/index.vue
@@ -96,12 +96,12 @@
             </ui-tooltip>
 
             <ui-btn v-if="showReadButton" color="info" :padding-x="4" small class="flex items-center h-9 mr-2" @click="openEbook">
-              <span class="material-symbols text-2xl -ml-2 pr-2 text-white">auto_stories</span>
+              <span class="material-symbols text-2xl -ml-2 pr-2 text-white" aria-hidden="true">auto_stories</span>
               {{ $strings.ButtonRead }}
             </ui-btn>
 
             <ui-tooltip v-if="userCanUpdate" :text="$strings.LabelEdit" direction="top">
-              <ui-icon-btn icon="&#xe3c9;" outlined class="mx-0.5" @click="editClick" />
+              <ui-icon-btn icon="&#xe3c9;" outlined class="mx-0.5" :aria-label="$strings.LabelEdit" @click="editClick" />
             </ui-tooltip>
 
             <ui-tooltip v-if="!isPodcast" :text="userIsFinished ? $strings.MessageMarkAsNotFinished : $strings.MessageMarkAsFinished" direction="top">
@@ -110,12 +110,12 @@
 
             <!-- Only admin or root user can download new episodes -->
             <ui-tooltip v-if="isPodcast && userIsAdminOrUp" :text="$strings.LabelFindEpisodes" direction="top">
-              <ui-icon-btn icon="search" class="mx-0.5" :loading="fetchingRSSFeed" outlined @click="findEpisodesClick" />
+              <ui-icon-btn icon="search" class="mx-0.5" :aria-label="$strings.LabelFindEpisodes" :loading="fetchingRSSFeed" outlined @click="findEpisodesClick" />
             </ui-tooltip>
 
             <ui-context-menu-dropdown v-if="contextMenuItems.length" :items="contextMenuItems" :menu-width="148" @action="contextMenuAction">
               <template #default="{ showMenu, clickShowMenu, disabled }">
-                <button type="button" :disabled="disabled" class="mx-0.5 icon-btn bg-primary border border-gray-600 w-9 h-9 rounded-md flex items-center justify-center relative" aria-haspopup="listbox" :aria-expanded="showMenu" @click.stop.prevent="clickShowMenu">
+                <button type="button" :disabled="disabled" class="mx-0.5 icon-btn bg-primary border border-gray-600 w-9 h-9 rounded-md flex items-center justify-center relative" aria-haspopup="listbox" :aria-expanded="showMenu" :aria-label="$strings.LabelMore" @click.stop.prevent="clickShowMenu">
                   <span class="material-symbols text-2xl">&#xe5d3;</span>
                 </button>
               </template>
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 77ec79923..eee94abf8 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -88,6 +88,8 @@
   "ButtonSaveTracklist": "Save Tracklist",
   "ButtonScan": "Scan",
   "ButtonScanLibrary": "Scan Library",
+  "ButtonScrollLeft": "Scroll Left",
+  "ButtonScrollRight": "Scroll Right",
   "ButtonSearch": "Search",
   "ButtonSelectFolderPath": "Select Folder Path",
   "ButtonSeries": "Series",
@@ -596,6 +598,8 @@
   "LabelSize": "Size",
   "LabelSleepTimer": "Sleep timer",
   "LabelSlug": "Slug",
+  "LabelSortAscending": "Ascending",
+  "LabelSortDescending": "Descending",
   "LabelStart": "Start",
   "LabelStartTime": "Start Time",
   "LabelStarted": "Started",
diff --git a/server/Database.js b/server/Database.js
index 95e13c6b4..afb09dae9 100644
--- a/server/Database.js
+++ b/server/Database.js
@@ -444,21 +444,6 @@ class Database {
     return updated
   }
 
-  async createFeed(oldFeed) {
-    if (!this.sequelize) return false
-    await this.models.feed.fullCreateFromOld(oldFeed)
-  }
-
-  updateFeed(oldFeed) {
-    if (!this.sequelize) return false
-    return this.models.feed.fullUpdateFromOld(oldFeed)
-  }
-
-  async removeFeed(feedId) {
-    if (!this.sequelize) return false
-    await this.models.feed.removeById(feedId)
-  }
-
   async createBulkBookAuthors(bookAuthors) {
     if (!this.sequelize) return false
     await this.models.bookAuthor.bulkCreate(bookAuthors)
diff --git a/server/Server.js b/server/Server.js
index 2f1220d87..95e3d6835 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -71,7 +71,6 @@ class Server {
     this.playbackSessionManager = new PlaybackSessionManager()
     this.podcastManager = new PodcastManager()
     this.audioMetadataManager = new AudioMetadataMangaer()
-    this.rssFeedManager = new RssFeedManager()
     this.cronManager = new CronManager(this.podcastManager, this.playbackSessionManager)
     this.apiCacheManager = new ApiCacheManager()
     this.binaryManager = new BinaryManager()
@@ -137,7 +136,7 @@ class Server {
 
     await ShareManager.init()
     await this.backupManager.init()
-    await this.rssFeedManager.init()
+    await RssFeedManager.init()
 
     const libraries = await Database.libraryModel.getAllWithFolders()
     await this.cronManager.init(libraries)
@@ -291,14 +290,14 @@ class Server {
     // RSS Feed temp route
     router.get('/feed/:slug', (req, res) => {
       Logger.info(`[Server] Requesting rss feed ${req.params.slug}`)
-      this.rssFeedManager.getFeed(req, res)
+      RssFeedManager.getFeed(req, res)
     })
     router.get('/feed/:slug/cover*', (req, res) => {
-      this.rssFeedManager.getFeedCover(req, res)
+      RssFeedManager.getFeedCover(req, res)
     })
     router.get('/feed/:slug/item/:episodeId/*', (req, res) => {
       Logger.debug(`[Server] Requesting rss feed episode ${req.params.slug}/${req.params.episodeId}`)
-      this.rssFeedManager.getFeedItem(req, res)
+      RssFeedManager.getFeedItem(req, res)
     })
 
     // Auth routes
diff --git a/server/controllers/CollectionController.js b/server/controllers/CollectionController.js
index 708c00b5f..3e35c08b5 100644
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -4,6 +4,7 @@ const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 
+const RssFeedManager = require('../managers/RssFeedManager')
 const Collection = require('../objects/Collection')
 
 /**
@@ -115,6 +116,7 @@ class CollectionController {
     }
 
     // If books array is passed in then update order in collection
+    let collectionBooksUpdated = false
     if (req.body.books?.length) {
       const collectionBooks = await req.collection.getCollectionBooks({
         include: {
@@ -133,9 +135,15 @@ class CollectionController {
           await collectionBooks[i].update({
             order: i + 1
           })
-          wasUpdated = true
+          collectionBooksUpdated = true
         }
       }
+
+      if (collectionBooksUpdated) {
+        req.collection.changed('updatedAt', true)
+        await req.collection.save()
+        wasUpdated = true
+      }
     }
 
     const jsonExpanded = await req.collection.getOldJsonExpanded()
@@ -148,6 +156,8 @@ class CollectionController {
   /**
    * DELETE: /api/collections/:id
    *
+   * @this {import('../routers/ApiRouter')}
+   *
    * @param {RequestWithUser} req
    * @param {Response} res
    */
@@ -155,7 +165,7 @@ class CollectionController {
     const jsonExpanded = await req.collection.getOldJsonExpanded()
 
     // Close rss feed - remove from db and emit socket event
-    await this.rssFeedManager.closeFeedForEntityId(req.collection.id)
+    await RssFeedManager.closeFeedForEntityId(req.collection.id)
 
     await req.collection.destroy()
 
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index fc15488dc..6e7fbea30 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -18,6 +18,8 @@ const LibraryScanner = require('../scanner/LibraryScanner')
 const Scanner = require('../scanner/Scanner')
 const Database = require('../Database')
 const Watcher = require('../Watcher')
+const RssFeedManager = require('../managers/RssFeedManager')
+
 const libraryFilters = require('../utils/queries/libraryFilters')
 const libraryItemsPodcastFilters = require('../utils/queries/libraryItemsPodcastFilters')
 const authorFilters = require('../utils/queries/authorFilters')
@@ -759,8 +761,8 @@ class LibraryController {
     }
 
     if (include.includes('rssfeed')) {
-      const feedObj = await this.rssFeedManager.findFeedForEntityId(seriesJson.id)
-      seriesJson.rssFeed = feedObj?.toJSONMinified() || null
+      const feedObj = await RssFeedManager.findFeedForEntityId(seriesJson.id)
+      seriesJson.rssFeed = feedObj?.toOldJSONMinified() || null
     }
 
     res.json(seriesJson)
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 5aaacee0d..f2a4383e2 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -13,6 +13,8 @@ const { getAudioMimeTypeFromExtname, encodeUriPath } = require('../utils/fileUti
 const LibraryItemScanner = require('../scanner/LibraryItemScanner')
 const AudioFileScanner = require('../scanner/AudioFileScanner')
 const Scanner = require('../scanner/Scanner')
+
+const RssFeedManager = require('../managers/RssFeedManager')
 const CacheManager = require('../managers/CacheManager')
 const CoverManager = require('../managers/CoverManager')
 const ShareManager = require('../managers/ShareManager')
@@ -48,8 +50,8 @@ class LibraryItemController {
       }
 
       if (includeEntities.includes('rssfeed')) {
-        const feedData = await this.rssFeedManager.findFeedForEntityId(item.id)
-        item.rssFeed = feedData?.toJSONMinified() || null
+        const feedData = await RssFeedManager.findFeedForEntityId(item.id)
+        item.rssFeed = feedData?.toOldJSONMinified() || null
       }
 
       if (item.mediaType === 'book' && req.user.isAdminOrUp && includeEntities.includes('share')) {
diff --git a/server/controllers/RSSFeedController.js b/server/controllers/RSSFeedController.js
index 2e07c10e2..e00164219 100644
--- a/server/controllers/RSSFeedController.js
+++ b/server/controllers/RSSFeedController.js
@@ -1,7 +1,8 @@
 const { Request, Response, NextFunction } = require('express')
 const Logger = require('../Logger')
 const Database = require('../Database')
-const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
+
+const RssFeedManager = require('../managers/RssFeedManager')
 
 /**
  * @typedef RequestUserObject
@@ -22,10 +23,10 @@ class RSSFeedController {
    * @param {Response} res
    */
   async getAll(req, res) {
-    const feeds = await this.rssFeedManager.getFeeds()
+    const feeds = await RssFeedManager.getFeeds()
     res.json({
-      feeds: feeds.map((f) => f.toJSON()),
-      minified: feeds.map((f) => f.toJSONMinified())
+      feeds: feeds.map((f) => f.toOldJSON()),
+      minified: feeds.map((f) => f.toOldJSONMinified())
     })
   }
 
@@ -38,38 +39,43 @@ class RSSFeedController {
    * @param {Response} res
    */
   async openRSSFeedForItem(req, res) {
-    const options = req.body || {}
+    const reqBody = req.body || {}
 
-    const item = await Database.libraryItemModel.getOldById(req.params.itemId)
-    if (!item) return res.sendStatus(404)
+    const itemExpanded = await Database.libraryItemModel.getExpandedById(req.params.itemId)
+    if (!itemExpanded) return res.sendStatus(404)
 
     // Check user can access this library item
-    if (!req.user.checkCanAccessLibraryItem(item)) {
-      Logger.error(`[RSSFeedController] User "${req.user.username}" attempted to open an RSS feed for item "${item.media.metadata.title}" that they don\'t have access to`)
+    if (!req.user.checkCanAccessLibraryItem(itemExpanded)) {
+      Logger.error(`[RSSFeedController] User "${req.user.username}" attempted to open an RSS feed for item "${itemExpanded.media.title}" that they don\'t have access to`)
       return res.sendStatus(403)
     }
 
     // Check request body options exist
-    if (!options.serverAddress || !options.slug) {
+    if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
       return res.status(400).send('Invalid request body')
     }
 
     // Check item has audio tracks
-    if (!item.media.numTracks) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed for item "${item.media.metadata.title}" because it has no audio tracks`)
+    if (!itemExpanded.hasAudioTracks()) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed for item "${itemExpanded.media.title}" because it has no audio tracks`)
       return res.status(400).send('Item has no audio tracks')
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(options.slug)) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${options.slug}" is already in use`)
+    if (await RssFeedManager.checkExistsBySlug(reqBody.slug)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
 
-    const feed = await this.rssFeedManager.openFeedForItem(req.user.id, item, req.body)
+    const feed = await RssFeedManager.openFeedForItem(req.user.id, itemExpanded, reqBody)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Failed to open RSS feed for item "${itemExpanded.media.title}"`)
+      return res.status(500).send('Failed to open RSS feed')
+    }
+
     res.json({
-      feed: feed.toJSONMinified()
+      feed: feed.toOldJSONMinified()
     })
   }
 
@@ -82,35 +88,37 @@ class RSSFeedController {
    * @param {Response} res
    */
   async openRSSFeedForCollection(req, res) {
-    const options = req.body || {}
-
-    const collection = await Database.collectionModel.findByPk(req.params.collectionId)
-    if (!collection) return res.sendStatus(404)
+    const reqBody = req.body || {}
 
     // Check request body options exist
-    if (!options.serverAddress || !options.slug) {
+    if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
       return res.status(400).send('Invalid request body')
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(options.slug)) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${options.slug}" is already in use`)
+    if (await RssFeedManager.checkExistsBySlug(reqBody.slug)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
 
-    const collectionExpanded = await collection.getOldJsonExpanded()
-    const collectionItemsWithTracks = collectionExpanded.books.filter((li) => li.media.tracks.length)
+    const collection = await Database.collectionModel.getExpandedById(req.params.collectionId)
+    if (!collection) return res.sendStatus(404)
 
     // Check collection has audio tracks
-    if (!collectionItemsWithTracks.length) {
+    if (!collection.books.some((book) => book.includedAudioFiles.length)) {
       Logger.error(`[RSSFeedController] Cannot open RSS feed for collection "${collection.name}" because it has no audio tracks`)
       return res.status(400).send('Collection has no audio tracks')
     }
 
-    const feed = await this.rssFeedManager.openFeedForCollection(req.user.id, collectionExpanded, req.body)
+    const feed = await RssFeedManager.openFeedForCollection(req.user.id, collection, reqBody)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Failed to open RSS feed for collection "${collection.name}"`)
+      return res.status(500).send('Failed to open RSS feed')
+    }
+
     res.json({
-      feed: feed.toJSONMinified()
+      feed: feed.toOldJSONMinified()
     })
   }
 
@@ -123,37 +131,37 @@ class RSSFeedController {
    * @param {Response} res
    */
   async openRSSFeedForSeries(req, res) {
-    const options = req.body || {}
-
-    const series = await Database.seriesModel.findByPk(req.params.seriesId)
-    if (!series) return res.sendStatus(404)
+    const reqBody = req.body || {}
 
     // Check request body options exist
-    if (!options.serverAddress || !options.slug) {
+    if (!reqBody.serverAddress || !reqBody.slug || typeof reqBody.serverAddress !== 'string' || typeof reqBody.slug !== 'string') {
       Logger.error(`[RSSFeedController] Invalid request body to open RSS feed`)
       return res.status(400).send('Invalid request body')
     }
 
     // Check that this slug is not being used for another feed (slug will also be the Feed id)
-    if (await this.rssFeedManager.findFeedBySlug(options.slug)) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${options.slug}" is already in use`)
+    if (await RssFeedManager.checkExistsBySlug(reqBody.slug)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed because slug "${reqBody.slug}" is already in use`)
       return res.status(400).send('Slug already in use')
     }
 
-    const seriesJson = series.toOldJSON()
-
-    // Get books in series that have audio tracks
-    seriesJson.books = (await libraryItemsBookFilters.getLibraryItemsForSeries(series)).filter((li) => li.media.numTracks)
+    const series = await Database.seriesModel.getExpandedById(req.params.seriesId)
+    if (!series) return res.sendStatus(404)
 
     // Check series has audio tracks
-    if (!seriesJson.books.length) {
-      Logger.error(`[RSSFeedController] Cannot open RSS feed for series "${seriesJson.name}" because it has no audio tracks`)
+    if (!series.books.some((book) => book.includedAudioFiles.length)) {
+      Logger.error(`[RSSFeedController] Cannot open RSS feed for series "${series.name}" because it has no audio tracks`)
       return res.status(400).send('Series has no audio tracks')
     }
 
-    const feed = await this.rssFeedManager.openFeedForSeries(req.user.id, seriesJson, req.body)
+    const feed = await RssFeedManager.openFeedForSeries(req.user.id, series, req.body)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Failed to open RSS feed for series "${series.name}"`)
+      return res.status(500).send('Failed to open RSS feed')
+    }
+
     res.json({
-      feed: feed.toJSONMinified()
+      feed: feed.toOldJSONMinified()
     })
   }
 
@@ -165,8 +173,16 @@ class RSSFeedController {
    * @param {RequestWithUser} req
    * @param {Response} res
    */
-  closeRSSFeed(req, res) {
-    this.rssFeedManager.closeRssFeed(req, res)
+  async closeRSSFeed(req, res) {
+    const feed = await Database.feedModel.findByPk(req.params.id)
+    if (!feed) {
+      Logger.error(`[RSSFeedController] Cannot close RSS feed because feed "${req.params.id}" does not exist`)
+      return res.sendStatus(404)
+    }
+
+    await RssFeedManager.handleCloseFeed(feed)
+
+    res.sendStatus(200)
   }
 
   /**
diff --git a/server/controllers/SeriesController.js b/server/controllers/SeriesController.js
index 5d761ba9f..21c93f332 100644
--- a/server/controllers/SeriesController.js
+++ b/server/controllers/SeriesController.js
@@ -2,6 +2,9 @@ const { Request, Response, NextFunction } = require('express')
 const Logger = require('../Logger')
 const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
+
+const RssFeedManager = require('../managers/RssFeedManager')
+
 const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
 
 /**
@@ -51,8 +54,8 @@ class SeriesController {
     }
 
     if (include.includes('rssfeed')) {
-      const feedObj = await this.rssFeedManager.findFeedForEntityId(seriesJson.id)
-      seriesJson.rssFeed = feedObj?.toJSONMinified() || null
+      const feedObj = await RssFeedManager.findFeedForEntityId(seriesJson.id)
+      seriesJson.rssFeed = feedObj?.toOldJSONMinified() || null
     }
 
     res.json(seriesJson)
diff --git a/server/managers/PodcastManager.js b/server/managers/PodcastManager.js
index 0a32e3cad..456927c8c 100644
--- a/server/managers/PodcastManager.js
+++ b/server/managers/PodcastManager.js
@@ -25,7 +25,9 @@ const LibraryItem = require('../objects/LibraryItem')
 
 class PodcastManager {
   constructor() {
+    /** @type {PodcastEpisodeDownload[]} */
     this.downloadQueue = []
+    /** @type {PodcastEpisodeDownload} */
     this.currentDownload = null
 
     this.failedCheckMap = {}
@@ -63,6 +65,11 @@ class PodcastManager {
     }
   }
 
+  /**
+   *
+   * @param {PodcastEpisodeDownload} podcastEpisodeDownload
+   * @returns
+   */
   async startPodcastEpisodeDownload(podcastEpisodeDownload) {
     if (this.currentDownload) {
       this.downloadQueue.push(podcastEpisodeDownload)
@@ -106,7 +113,7 @@ class PodcastManager {
     }
 
     let success = false
-    if (this.currentDownload.urlFileExtension === 'mp3') {
+    if (this.currentDownload.isMp3) {
       // Download episode and tag it
       success = await ffmpegHelpers.downloadPodcastEpisode(this.currentDownload).catch((error) => {
         Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index 583f0bb67..03d3c167d 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -6,76 +6,139 @@ const SocketAuthority = require('../SocketAuthority')
 const Database = require('../Database')
 
 const fs = require('../libs/fsExtra')
-const Feed = require('../objects/Feed')
-const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
 
 class RssFeedManager {
   constructor() {}
 
-  async validateFeedEntity(feedObj) {
-    if (feedObj.entityType === 'collection') {
-      const collection = await Database.collectionModel.getOldById(feedObj.entityId)
-      if (!collection) {
-        Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Collection "${feedObj.entityId}" not found`)
-        return false
-      }
-    } else if (feedObj.entityType === 'libraryItem') {
-      const libraryItemExists = await Database.libraryItemModel.checkExistsById(feedObj.entityId)
-      if (!libraryItemExists) {
-        Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Library item "${feedObj.entityId}" not found`)
-        return false
-      }
-    } else if (feedObj.entityType === 'series') {
-      const series = await Database.seriesModel.findByPk(feedObj.entityId)
-      if (!series) {
-        Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Series "${feedObj.entityId}" not found`)
-        return false
-      }
-    } else {
-      Logger.error(`[RssFeedManager] Removing feed "${feedObj.id}". Invalid entityType "${feedObj.entityType}"`)
-      return false
-    }
-    return true
-  }
-
   /**
-   * Validate all feeds and remove invalid
+   * Remove invalid feeds (invalid if the entity does not exist)
    */
   async init() {
-    const feeds = await Database.feedModel.getOldFeeds()
+    const feeds = await Database.feedModel.findAll({
+      attributes: ['id', 'entityId', 'entityType', 'title'],
+      include: [
+        {
+          model: Database.libraryItemModel,
+          attributes: ['id']
+        },
+        {
+          model: Database.collectionModel,
+          attributes: ['id']
+        },
+        {
+          model: Database.seriesModel,
+          attributes: ['id']
+        }
+      ]
+    })
+
+    const feedIdsToRemove = []
     for (const feed of feeds) {
-      // Remove invalid feeds
-      if (!(await this.validateFeedEntity(feed))) {
-        await Database.removeFeed(feed.id)
+      if (!feed.entity) {
+        Logger.error(`[RssFeedManager] Removing feed "${feed.title}". Entity not found`)
+        feedIdsToRemove.push(feed.id)
       }
     }
+
+    if (feedIdsToRemove.length) {
+      Logger.info(`[RssFeedManager] Removing ${feedIdsToRemove.length} invalid feeds`)
+      await Database.feedModel.destroy({
+        where: {
+          id: feedIdsToRemove
+        }
+      })
+    }
   }
 
   /**
    * Find open feed for an entity (e.g. collection id, playlist id, library item id)
    * @param {string} entityId
-   * @returns {Promise<objects.Feed>} oldFeed
+   * @returns {Promise<import('../models/Feed')>}
    */
   findFeedForEntityId(entityId) {
-    return Database.feedModel.findOneOld({ entityId })
+    return Database.feedModel.findOne({
+      where: {
+        entityId
+      }
+    })
   }
 
   /**
-   * Find open feed for a slug
+   *
    * @param {string} slug
-   * @returns {Promise<objects.Feed>} oldFeed
+   * @returns {Promise<boolean>}
    */
-  findFeedBySlug(slug) {
-    return Database.feedModel.findOneOld({ slug })
+  checkExistsBySlug(slug) {
+    return Database.feedModel
+      .count({
+        where: {
+          slug
+        }
+      })
+      .then((count) => count > 0)
   }
 
   /**
-   * Find open feed for a slug
-   * @param {string} slug
-   * @returns {Promise<objects.Feed>} oldFeed
+   * Feed requires update if the entity (or child entities) has been updated since the feed was last updated
+   *
+   * @param {import('../models/Feed')} feed
+   * @returns {Promise<boolean>}
    */
-  findFeed(id) {
-    return Database.feedModel.findByPkOld(id)
+  async checkFeedRequiresUpdate(feed) {
+    if (feed.entityType === 'libraryItem') {
+      feed.entity = await feed.getEntity({
+        attributes: ['id', 'updatedAt', 'mediaId', 'mediaType']
+      })
+
+      let newEntityUpdatedAt = feed.entity.updatedAt
+
+      if (feed.entity.mediaType === 'podcast') {
+        const mostRecentPodcastEpisode = await Database.podcastEpisodeModel.findOne({
+          where: {
+            podcastId: feed.entity.mediaId
+          },
+          attributes: ['id', 'updatedAt'],
+          order: [['createdAt', 'DESC']]
+        })
+        if (mostRecentPodcastEpisode && mostRecentPodcastEpisode.updatedAt > newEntityUpdatedAt) {
+          newEntityUpdatedAt = mostRecentPodcastEpisode.updatedAt
+        }
+      }
+
+      return newEntityUpdatedAt > feed.entityUpdatedAt
+    } else if (feed.entityType === 'collection' || feed.entityType === 'series') {
+      feed.entity = await feed.getEntity({
+        attributes: ['id', 'updatedAt'],
+        include: {
+          model: Database.bookModel,
+          attributes: ['id'],
+          through: {
+            attributes: []
+          },
+          include: {
+            model: Database.libraryItemModel,
+            attributes: ['id', 'updatedAt']
+          }
+        }
+      })
+
+      let newEntityUpdatedAt = feed.entity.updatedAt
+
+      const mostRecentItemUpdatedAt = feed.entity.books.reduce((mostRecent, book) => {
+        if (book.libraryItem.updatedAt > mostRecent) {
+          return book.libraryItem.updatedAt
+        }
+        return mostRecent
+      }, 0)
+
+      if (mostRecentItemUpdatedAt > newEntityUpdatedAt) {
+        newEntityUpdatedAt = mostRecentItemUpdatedAt
+      }
+
+      return newEntityUpdatedAt > feed.entityUpdatedAt
+    } else {
+      throw new Error('Invalid feed entity type')
+    }
   }
 
   /**
@@ -85,88 +148,23 @@ class RssFeedManager {
    * @param {Response} res
    */
   async getFeed(req, res) {
-    const feed = await this.findFeedBySlug(req.params.slug)
+    let feed = await Database.feedModel.findOne({
+      where: {
+        slug: req.params.slug
+      }
+    })
     if (!feed) {
       Logger.warn(`[RssFeedManager] Feed not found ${req.params.slug}`)
       res.sendStatus(404)
       return
     }
 
-    // Check if feed needs to be updated
-    if (feed.entityType === 'libraryItem') {
-      const libraryItem = await Database.libraryItemModel.getOldById(feed.entityId)
-
-      let mostRecentlyUpdatedAt = libraryItem.updatedAt
-      if (libraryItem.isPodcast) {
-        libraryItem.media.episodes.forEach((episode) => {
-          if (episode.updatedAt > mostRecentlyUpdatedAt) mostRecentlyUpdatedAt = episode.updatedAt
-        })
-      }
-
-      if (libraryItem && (!feed.entityUpdatedAt || mostRecentlyUpdatedAt > feed.entityUpdatedAt)) {
-        Logger.debug(`[RssFeedManager] Updating RSS feed for item ${libraryItem.id} "${libraryItem.media.metadata.title}"`)
-
-        feed.updateFromItem(libraryItem)
-        await Database.updateFeed(feed)
-      }
-    } else if (feed.entityType === 'collection') {
-      const collection = await Database.collectionModel.findByPk(feed.entityId, {
-        include: Database.collectionBookModel
-      })
-      if (collection) {
-        const collectionExpanded = await collection.getOldJsonExpanded()
-
-        // Find most recently updated item in collection
-        let mostRecentlyUpdatedAt = collectionExpanded.lastUpdate
-        // Check for most recently updated book
-        collectionExpanded.books.forEach((libraryItem) => {
-          if (libraryItem.media.tracks.length && libraryItem.updatedAt > mostRecentlyUpdatedAt) {
-            mostRecentlyUpdatedAt = libraryItem.updatedAt
-          }
-        })
-        // Check for most recently added collection book
-        collection.collectionBooks.forEach((collectionBook) => {
-          if (collectionBook.createdAt.valueOf() > mostRecentlyUpdatedAt) {
-            mostRecentlyUpdatedAt = collectionBook.createdAt.valueOf()
-          }
-        })
-        const hasBooksRemoved = collection.collectionBooks.length < feed.episodes.length
-
-        if (!feed.entityUpdatedAt || hasBooksRemoved || mostRecentlyUpdatedAt > feed.entityUpdatedAt) {
-          Logger.debug(`[RssFeedManager] Updating RSS feed for collection "${collection.name}"`)
-
-          feed.updateFromCollection(collectionExpanded)
-          await Database.updateFeed(feed)
-        }
-      }
-    } else if (feed.entityType === 'series') {
-      const series = await Database.seriesModel.findByPk(feed.entityId)
-      if (series) {
-        const seriesJson = series.toOldJSON()
-
-        // Get books in series that have audio tracks
-        seriesJson.books = (await libraryItemsBookFilters.getLibraryItemsForSeries(series)).filter((li) => li.media.numTracks)
-
-        // Find most recently updated item in series
-        let mostRecentlyUpdatedAt = seriesJson.updatedAt
-        let totalTracks = 0 // Used to detect series items removed
-        seriesJson.books.forEach((libraryItem) => {
-          totalTracks += libraryItem.media.tracks.length
-          if (libraryItem.media.tracks.length && libraryItem.updatedAt > mostRecentlyUpdatedAt) {
-            mostRecentlyUpdatedAt = libraryItem.updatedAt
-          }
-        })
-        if (totalTracks !== feed.episodes.length) {
-          mostRecentlyUpdatedAt = Date.now()
-        }
-
-        if (!feed.entityUpdatedAt || mostRecentlyUpdatedAt > feed.entityUpdatedAt) {
-          Logger.debug(`[RssFeedManager] Updating RSS feed for series "${seriesJson.name}"`)
-
-          feed.updateFromSeries(seriesJson)
-          await Database.updateFeed(feed)
-        }
-      }
+    const feedRequiresUpdate = await this.checkFeedRequiresUpdate(feed)
+    if (feedRequiresUpdate) {
+      Logger.info(`[RssFeedManager] Feed "${feed.title}" requires update - updating feed`)
+      feed = await feed.updateFeedForEntity()
+    } else {
+      feed.feedEpisodes = await feed.getFeedEpisodes()
     }
 
     const xml = feed.buildXml(req.originalHostPrefix)
@@ -181,7 +179,17 @@ class RssFeedManager {
    * @param {Response} res
    */
   async getFeedItem(req, res) {
-    const feed = await this.findFeedBySlug(req.params.slug)
+    const feed = await Database.feedModel.findOne({
+      where: {
+        slug: req.params.slug
+      },
+      attributes: ['id', 'slug'],
+      include: {
+        model: Database.feedEpisodeModel,
+        attributes: ['id', 'filePath']
+      }
+    })
+
     if (!feed) {
       Logger.debug(`[RssFeedManager] Feed not found ${req.params.slug}`)
       res.sendStatus(404)
@@ -203,7 +211,12 @@ class RssFeedManager {
    * @param {Response} res
    */
   async getFeedCover(req, res) {
-    const feed = await this.findFeedBySlug(req.params.slug)
+    const feed = await Database.feedModel.findOne({
+      where: {
+        slug: req.params.slug
+      },
+      attributes: ['coverPath']
+    })
     if (!feed) {
       Logger.debug(`[RssFeedManager] Feed not found ${req.params.slug}`)
       res.sendStatus(404)
@@ -223,100 +236,143 @@ class RssFeedManager {
 
   /**
    *
-   * @param {string} userId
-   * @param {*} libraryItem
    * @param {*} options
-   * @returns
+   * @returns {import('../models/Feed').FeedOptions}
+   */
+  getFeedOptionsFromReqOptions(options) {
+    const metadataDetails = options.metadataDetails || {}
+
+    if (metadataDetails.preventIndexing !== false) {
+      metadataDetails.preventIndexing = true
+    }
+
+    return {
+      preventIndexing: metadataDetails.preventIndexing,
+      ownerName: metadataDetails.ownerName && typeof metadataDetails.ownerName === 'string' ? metadataDetails.ownerName : null,
+      ownerEmail: metadataDetails.ownerEmail && typeof metadataDetails.ownerEmail === 'string' ? metadataDetails.ownerEmail : null
+    }
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('../models/LibraryItem')} libraryItem
+   * @param {*} options
+   * @returns {Promise<import('../models/Feed').FeedExpanded>}
    */
   async openFeedForItem(userId, libraryItem, options) {
     const serverAddress = options.serverAddress
     const slug = options.slug
-    const preventIndexing = options.metadataDetails?.preventIndexing ?? true
-    const ownerName = options.metadataDetails?.ownerName
-    const ownerEmail = options.metadataDetails?.ownerEmail
+    const feedOptions = this.getFeedOptionsFromReqOptions(options)
 
-    const feed = new Feed()
-    feed.setFromItem(userId, slug, libraryItem, serverAddress, preventIndexing, ownerName, ownerEmail)
-
-    Logger.info(`[RssFeedManager] Opened RSS feed "${feed.feedUrl}"`)
-    await Database.createFeed(feed)
-    SocketAuthority.emitter('rss_feed_open', feed.toJSONMinified())
-    return feed
+    Logger.info(`[RssFeedManager] Creating RSS feed for item ${libraryItem.id} "${libraryItem.media.title}"`)
+    const feedExpanded = await Database.feedModel.createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions)
+    if (feedExpanded) {
+      Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`)
+      SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified())
+    }
+    return feedExpanded
   }
 
   /**
    *
    * @param {string} userId
-   * @param {*} collectionExpanded
+   * @param {import('../models/Collection')} collectionExpanded
    * @param {*} options
-   * @returns
+   * @returns {Promise<import('../models/Feed').FeedExpanded>}
    */
   async openFeedForCollection(userId, collectionExpanded, options) {
     const serverAddress = options.serverAddress
     const slug = options.slug
-    const preventIndexing = options.metadataDetails?.preventIndexing ?? true
-    const ownerName = options.metadataDetails?.ownerName
-    const ownerEmail = options.metadataDetails?.ownerEmail
+    const feedOptions = this.getFeedOptionsFromReqOptions(options)
 
-    const feed = new Feed()
-    feed.setFromCollection(userId, slug, collectionExpanded, serverAddress, preventIndexing, ownerName, ownerEmail)
-
-    Logger.info(`[RssFeedManager] Opened RSS feed "${feed.feedUrl}"`)
-    await Database.createFeed(feed)
-    SocketAuthority.emitter('rss_feed_open', feed.toJSONMinified())
-    return feed
+    Logger.info(`[RssFeedManager] Creating RSS feed for collection "${collectionExpanded.name}"`)
+    const feedExpanded = await Database.feedModel.createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions)
+    if (feedExpanded) {
+      Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`)
+      SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified())
+    }
+    return feedExpanded
   }
 
   /**
    *
    * @param {string} userId
-   * @param {*} seriesExpanded
+   * @param {import('../models/Series')} seriesExpanded
    * @param {*} options
-   * @returns
+   * @returns {Promise<import('../models/Feed').FeedExpanded>}
    */
   async openFeedForSeries(userId, seriesExpanded, options) {
     const serverAddress = options.serverAddress
     const slug = options.slug
-    const preventIndexing = options.metadataDetails?.preventIndexing ?? true
-    const ownerName = options.metadataDetails?.ownerName
-    const ownerEmail = options.metadataDetails?.ownerEmail
+    const feedOptions = this.getFeedOptionsFromReqOptions(options)
 
-    const feed = new Feed()
-    feed.setFromSeries(userId, slug, seriesExpanded, serverAddress, preventIndexing, ownerName, ownerEmail)
-
-    Logger.info(`[RssFeedManager] Opened RSS feed "${feed.feedUrl}"`)
-    await Database.createFeed(feed)
-    SocketAuthority.emitter('rss_feed_open', feed.toJSONMinified())
-    return feed
-  }
-
-  async handleCloseFeed(feed) {
-    if (!feed) return
-    await Database.removeFeed(feed.id)
-    SocketAuthority.emitter('rss_feed_closed', feed.toJSONMinified())
-    Logger.info(`[RssFeedManager] Closed RSS feed "${feed.feedUrl}"`)
-  }
-
-  async closeRssFeed(req, res) {
-    const feed = await this.findFeed(req.params.id)
-    if (!feed) {
-      Logger.error(`[RssFeedManager] RSS feed not found with id "${req.params.id}"`)
-      return res.sendStatus(404)
+    Logger.info(`[RssFeedManager] Creating RSS feed for series "${seriesExpanded.name}"`)
+    const feedExpanded = await Database.feedModel.createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions)
+    if (feedExpanded) {
+      Logger.info(`[RssFeedManager] Opened RSS feed "${feedExpanded.feedURL}"`)
+      SocketAuthority.emitter('rss_feed_open', feedExpanded.toOldJSONMinified())
     }
-    await this.handleCloseFeed(feed)
-    res.sendStatus(200)
+    return feedExpanded
   }
 
+  /**
+   * Close Feed and emit Socket event
+   *
+   * @param {import('../models/Feed')} feed
+   * @returns {Promise<boolean>} - true if feed was closed
+   */
+  async handleCloseFeed(feed) {
+    if (!feed) return false
+    const wasRemoved = await Database.feedModel.removeById(feed.id)
+    SocketAuthority.emitter('rss_feed_closed', feed.toOldJSONMinified())
+    Logger.info(`[RssFeedManager] Closed RSS feed "${feed.feedURL}"`)
+    return wasRemoved
+  }
+
+  /**
+   *
+   * @param {string} entityId
+   * @returns {Promise<boolean>} - true if feed was closed
+   */
   async closeFeedForEntityId(entityId) {
-    const feed = await this.findFeedForEntityId(entityId)
-    if (!feed) return
+    const feed = await Database.feedModel.findOne({
+      where: {
+        entityId
+      }
+    })
+    if (!feed) {
+      Logger.warn(`[RssFeedManager] closeFeedForEntityId: Feed not found for entity id ${entityId}`)
+      return false
+    }
     return this.handleCloseFeed(feed)
   }
 
-  async getFeeds() {
-    const feeds = await Database.models.feed.getOldFeeds()
-    Logger.info(`[RssFeedManager] Fetched all feeds`)
-    return feeds
+  /**
+   *
+   * @param {string[]} entityIds
+   */
+  async closeFeedsForEntityIds(entityIds) {
+    const feeds = await Database.feedModel.findAll({
+      where: {
+        entityId: entityIds
+      }
+    })
+    for (const feed of feeds) {
+      await this.handleCloseFeed(feed)
+    }
+  }
+
+  /**
+   *
+   * @returns {Promise<import('../models/Feed').FeedExpanded[]>}
+   */
+  getFeeds() {
+    return Database.feedModel.findAll({
+      include: {
+        model: Database.feedEpisodeModel
+      }
+    })
   }
 }
-module.exports = RssFeedManager
+module.exports = new RssFeedManager()
diff --git a/server/models/Book.js b/server/models/Book.js
index a8ccf73d6..f7341db90 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -29,6 +29,12 @@ const Logger = require('../Logger')
  * @property {SeriesExpanded[]} series
  *
  * @typedef {Book & BookExpandedProperties} BookExpanded
+ *
+ * Collections use BookExpandedWithLibraryItem
+ * @typedef BookExpandedWithLibraryItemProperties
+ * @property {import('./LibraryItem')} libraryItem
+ *
+ * @typedef {BookExpanded & BookExpandedWithLibraryItemProperties} BookExpandedWithLibraryItem
  */
 
 /**
@@ -106,6 +112,9 @@ class Book extends Model {
     this.updatedAt
     /** @type {Date} */
     this.createdAt
+
+    /** @type {import('./Author')[]} - optional if expanded */
+    this.authors
   }
 
   static getOldBook(libraryItemExpanded) {
@@ -320,6 +329,32 @@ class Book extends Model {
       }
     )
   }
+
+  /**
+   * Comma separated array of author names
+   * Requires authors to be loaded
+   *
+   * @returns {string}
+   */
+  get authorName() {
+    if (this.authors === undefined) {
+      Logger.error(`[Book] authorName: Cannot get authorName because authors are not loaded`)
+      return ''
+    }
+    return this.authors.map((au) => au.name).join(', ')
+  }
+  get includedAudioFiles() {
+    return this.audioFiles.filter((af) => !af.exclude)
+  }
+  get trackList() {
+    let startOffset = 0
+    return this.includedAudioFiles.map((af) => {
+      const track = structuredClone(af)
+      track.startOffset = startOffset
+      startOffset += track.duration
+      return track
+    })
+  }
 }
 
 module.exports = Book
diff --git a/server/models/Collection.js b/server/models/Collection.js
index a001dc5b6..e01ad90a6 100644
--- a/server/models/Collection.js
+++ b/server/models/Collection.js
@@ -18,6 +18,11 @@ class Collection extends Model {
     this.updatedAt
     /** @type {Date} */
     this.createdAt
+
+    // Expanded properties
+
+    /** @type {import('./Book').BookExpandedWithLibraryItem[]} - only set when expanded */
+    this.books
   }
 
   /**
@@ -107,7 +112,7 @@ class Collection extends Model {
 
         // Map feed if found
         if (c.feeds?.length) {
-          collectionExpanded.rssFeed = this.sequelize.models.feed.getOldFeed(c.feeds[0])
+          collectionExpanded.rssFeed = c.feeds[0].toOldJSON()
         }
 
         return collectionExpanded
@@ -115,6 +120,39 @@ class Collection extends Model {
       .filter((c) => c)
   }
 
+  /**
+   *
+   * @param {string} collectionId
+   * @returns {Promise<Collection>}
+   */
+  static async getExpandedById(collectionId) {
+    return this.findByPk(collectionId, {
+      include: [
+        {
+          model: this.sequelize.models.book,
+          include: [
+            {
+              model: this.sequelize.models.libraryItem
+            },
+            {
+              model: this.sequelize.models.author,
+              through: {
+                attributes: []
+              }
+            },
+            {
+              model: this.sequelize.models.series,
+              through: {
+                attributes: ['sequence']
+              }
+            }
+          ]
+        }
+      ],
+      order: [[this.sequelize.models.book, this.sequelize.models.collectionBook, 'order', 'ASC']]
+    })
+  }
+
   /**
    * Get old collection from Collection
    * @param {Collection} collectionExpanded
@@ -219,6 +257,34 @@ class Collection extends Model {
     Collection.belongsTo(library)
   }
 
+  /**
+   * Get all books in collection expanded with library item
+   *
+   * @returns {Promise<import('./Book').BookExpandedWithLibraryItem[]>}
+   */
+  getBooksExpandedWithLibraryItem() {
+    return this.getBooks({
+      include: [
+        {
+          model: this.sequelize.models.libraryItem
+        },
+        {
+          model: this.sequelize.models.author,
+          through: {
+            attributes: []
+          }
+        },
+        {
+          model: this.sequelize.models.series,
+          through: {
+            attributes: ['sequence']
+          }
+        }
+      ],
+      order: [Sequelize.literal('`collectionBook.order` ASC')]
+    })
+  }
+
   /**
    * Get old collection toJSONExpanded, items filtered for user permissions
    *
@@ -282,7 +348,7 @@ class Collection extends Model {
     if (include?.includes('rssfeed')) {
       const feeds = await this.getFeeds()
       if (feeds?.length) {
-        collectionExpanded.rssFeed = this.sequelize.models.feed.getOldFeed(feeds[0])
+        collectionExpanded.rssFeed = feeds[0].toOldJSON()
       }
     }
 
diff --git a/server/models/Feed.js b/server/models/Feed.js
index 4f51e66d9..d8f8553ca 100644
--- a/server/models/Feed.js
+++ b/server/models/Feed.js
@@ -1,6 +1,22 @@
+const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
-const oldFeed = require('../objects/Feed')
-const areEquivalent = require('../utils/areEquivalent')
+const Logger = require('../Logger')
+
+const RSS = require('../libs/rss')
+
+/**
+ * @typedef FeedOptions
+ * @property {boolean} preventIndexing
+ * @property {string} ownerName
+ * @property {string} ownerEmail
+ */
+
+/**
+ * @typedef FeedExpandedProperties
+ * @property {import('./FeedEpisode')} feedEpisodes
+ *
+ * @typedef {Feed & FeedExpandedProperties} FeedExpanded
+ */
 
 class Feed extends Model {
   constructor(values, options) {
@@ -50,210 +66,288 @@ class Feed extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
-  }
 
-  static async getOldFeeds() {
-    const feeds = await this.findAll({
-      include: {
-        model: this.sequelize.models.feedEpisode
-      }
-    })
-    return feeds.map((f) => this.getOldFeed(f))
+    // Expanded properties
+
+    /** @type {import('./FeedEpisode')[]} - only set if expanded */
+    this.feedEpisodes
   }
 
   /**
-   * Get old feed from Feed and optionally Feed with FeedEpisodes
-   * @param {Feed} feedExpanded
-   * @returns {oldFeed}
+   * @param {string} feedId
+   * @returns {Promise<boolean>} - true if feed was removed
    */
-  static getOldFeed(feedExpanded) {
-    const episodes = feedExpanded.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode())
-    return new oldFeed({
-      id: feedExpanded.id,
-      slug: feedExpanded.slug,
-      userId: feedExpanded.userId,
-      entityType: feedExpanded.entityType,
-      entityId: feedExpanded.entityId,
-      entityUpdatedAt: feedExpanded.entityUpdatedAt?.valueOf() || null,
-      coverPath: feedExpanded.coverPath || null,
-      meta: {
-        title: feedExpanded.title,
-        description: feedExpanded.description,
-        author: feedExpanded.author,
-        imageUrl: feedExpanded.imageURL,
-        feedUrl: feedExpanded.feedURL,
-        link: feedExpanded.siteURL,
-        explicit: feedExpanded.explicit,
-        type: feedExpanded.podcastType,
-        language: feedExpanded.language,
-        preventIndexing: feedExpanded.preventIndexing,
-        ownerName: feedExpanded.ownerName,
-        ownerEmail: feedExpanded.ownerEmail
-      },
-      serverAddress: feedExpanded.serverAddress,
-      feedUrl: feedExpanded.feedURL,
-      episodes: episodes || [],
-      createdAt: feedExpanded.createdAt.valueOf(),
-      updatedAt: feedExpanded.updatedAt.valueOf()
-    })
-  }
-
-  static removeById(feedId) {
-    return this.destroy({
-      where: {
-        id: feedId
-      }
-    })
+  static async removeById(feedId) {
+    return (
+      (await this.destroy({
+        where: {
+          id: feedId
+        }
+      })) > 0
+    )
   }
 
   /**
-   * Find all library item ids that have an open feed (used in library filter)
-   * @returns {Promise<string[]>} array of library item ids
+   *
+   * @param {string} userId
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItem
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} [feedOptions=null]
+   *
+   * @returns {Feed}
    */
-  static async findAllLibraryItemIds() {
-    const feeds = await this.findAll({
-      attributes: ['entityId'],
-      where: {
-        entityType: 'libraryItem'
-      }
-    })
-    return feeds.map((f) => f.entityId).filter((f) => f) || []
-  }
+  static getFeedObjForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions = null) {
+    const media = libraryItem.media
 
-  /**
-   * Find feed where and return oldFeed
-   * @param {Object} where sequelize where object
-   * @returns {Promise<oldFeed>} oldFeed
-   */
-  static async findOneOld(where) {
-    if (!where) return null
-    const feedExpanded = await this.findOne({
-      where,
-      include: {
-        model: this.sequelize.models.feedEpisode
-      }
-    })
-    if (!feedExpanded) return null
-    return this.getOldFeed(feedExpanded)
-  }
+    let entityUpdatedAt = libraryItem.updatedAt
 
-  /**
-   * Find feed and return oldFeed
-   * @param {string} id
-   * @returns {Promise<oldFeed>} oldFeed
-   */
-  static async findByPkOld(id) {
-    if (!id) return null
-    const feedExpanded = await this.findByPk(id, {
-      include: {
-        model: this.sequelize.models.feedEpisode
-      }
-    })
-    if (!feedExpanded) return null
-    return this.getOldFeed(feedExpanded)
-  }
-
-  static async fullCreateFromOld(oldFeed) {
-    const feedObj = this.getFromOld(oldFeed)
-    const newFeed = await this.create(feedObj)
-
-    if (oldFeed.episodes?.length) {
-      for (const oldFeedEpisode of oldFeed.episodes) {
-        const feedEpisode = this.sequelize.models.feedEpisode.getFromOld(oldFeedEpisode)
-        feedEpisode.feedId = newFeed.id
-        await this.sequelize.models.feedEpisode.create(feedEpisode)
-      }
+    // Podcast feeds should use the most recent episode updatedAt if more recent
+    if (libraryItem.mediaType === 'podcast') {
+      entityUpdatedAt = libraryItem.media.podcastEpisodes.reduce((mostRecent, episode) => {
+        return episode.updatedAt > mostRecent ? episode.updatedAt : mostRecent
+      }, entityUpdatedAt)
     }
+
+    const feedObj = {
+      slug,
+      entityType: 'libraryItem',
+      entityId: libraryItem.id,
+      entityUpdatedAt,
+      serverAddress,
+      feedURL: `/feed/${slug}`,
+      imageURL: media.coverPath ? `/feed/${slug}/cover${Path.extname(media.coverPath)}` : `/Logo.png`,
+      siteURL: `/item/${libraryItem.id}`,
+      title: media.title,
+      description: media.description,
+      author: libraryItem.mediaType === 'podcast' ? media.author : media.authorName,
+      podcastType: libraryItem.mediaType === 'podcast' ? media.podcastType : 'serial',
+      language: media.language,
+      explicit: media.explicit,
+      coverPath: media.coverPath,
+      userId
+    }
+
+    if (feedOptions) {
+      feedObj.preventIndexing = feedOptions.preventIndexing
+      feedObj.ownerName = feedOptions.ownerName
+      feedObj.ownerEmail = feedOptions.ownerEmail
+    }
+
+    return feedObj
   }
 
-  static async fullUpdateFromOld(oldFeed) {
-    const oldFeedEpisodes = oldFeed.episodes || []
-    const feedObj = this.getFromOld(oldFeed)
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItem
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions) {
+    const feedObj = this.getFeedObjForLibraryItem(userId, libraryItem, slug, serverAddress, feedOptions)
 
-    const existingFeed = await this.findByPk(feedObj.id, {
-      include: this.sequelize.models.feedEpisode
-    })
-    if (!existingFeed) return false
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
 
-    let hasUpdates = false
+    const transaction = await this.sequelize.transaction()
+    try {
+      const feed = await this.create(feedObj, { transaction })
 
-    // Remove and update existing feed episodes
-    for (const feedEpisode of existingFeed.feedEpisodes) {
-      const oldFeedEpisode = oldFeedEpisodes.find((ep) => ep.id === feedEpisode.id)
-      // Episode removed
-      if (!oldFeedEpisode) {
-        feedEpisode.destroy()
+      if (libraryItem.mediaType === 'podcast') {
+        feed.feedEpisodes = await feedEpisodeModel.createFromPodcastEpisodes(libraryItem, feed, slug, transaction)
       } else {
-        let episodeHasUpdates = false
-        const oldFeedEpisodeCleaned = this.sequelize.models.feedEpisode.getFromOld(oldFeedEpisode)
-        for (const key in oldFeedEpisodeCleaned) {
-          if (!areEquivalent(oldFeedEpisodeCleaned[key], feedEpisode[key])) {
-            episodeHasUpdates = true
-          }
-        }
-        if (episodeHasUpdates) {
-          await feedEpisode.update(oldFeedEpisodeCleaned)
-          hasUpdates = true
-        }
+        feed.feedEpisodes = await feedEpisodeModel.createFromAudiobookTracks(libraryItem, feed, slug, transaction)
       }
+
+      await transaction.commit()
+
+      return feed
+    } catch (error) {
+      Logger.error(`[Feed] Error creating feed for library item ${libraryItem.id}`, error)
+      await transaction.rollback()
+      return null
     }
-
-    // Add new feed episodes
-    for (const episode of oldFeedEpisodes) {
-      if (!existingFeed.feedEpisodes.some((fe) => fe.id === episode.id)) {
-        await this.sequelize.models.feedEpisode.createFromOld(feedObj.id, episode)
-        hasUpdates = true
-      }
-    }
-
-    let feedHasUpdates = false
-    for (const key in feedObj) {
-      let existingValue = existingFeed[key]
-      if (existingValue instanceof Date) existingValue = existingValue.valueOf()
-
-      if (!areEquivalent(existingValue, feedObj[key])) {
-        feedHasUpdates = true
-      }
-    }
-
-    if (feedHasUpdates) {
-      await existingFeed.update(feedObj)
-      hasUpdates = true
-    }
-
-    return hasUpdates
   }
 
-  static getFromOld(oldFeed) {
-    const oldFeedMeta = oldFeed.meta || {}
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Collection')} collectionExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} [feedOptions=null]
+   *
+   * @returns {{ feedObj: Feed, booksWithTracks: import('./Book').BookExpandedWithLibraryItem[] }}
+   */
+  static getFeedObjForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions = null) {
+    const booksWithTracks = collectionExpanded.books.filter((book) => book.includedAudioFiles.length)
+
+    const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
+      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+    }, collectionExpanded.updatedAt)
+
+    const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
+
+    const allBookAuthorNames = booksWithTracks.reduce((authorNames, book) => {
+      const bookAuthorsToAdd = book.authors.filter((author) => !authorNames.includes(author.name)).map((author) => author.name)
+      return authorNames.concat(bookAuthorsToAdd)
+    }, [])
+    let author = allBookAuthorNames.slice(0, 3).join(', ')
+    if (allBookAuthorNames.length > 3) {
+      author += ' & more'
+    }
+
+    const feedObj = {
+      slug,
+      entityType: 'collection',
+      entityId: collectionExpanded.id,
+      entityUpdatedAt,
+      serverAddress,
+      feedURL: `/feed/${slug}`,
+      imageURL: firstBookWithCover?.coverPath ? `/feed/${slug}/cover${Path.extname(firstBookWithCover.coverPath)}` : `/Logo.png`,
+      siteURL: `/collection/${collectionExpanded.id}`,
+      title: collectionExpanded.name,
+      description: collectionExpanded.description || '',
+      author,
+      podcastType: 'serial',
+      explicit: booksWithTracks.some((book) => book.explicit), // If any book is explicit, the feed is explicit
+      coverPath: firstBookWithCover?.coverPath || null,
+      userId
+    }
+
+    if (feedOptions) {
+      feedObj.preventIndexing = feedOptions.preventIndexing
+      feedObj.ownerName = feedOptions.ownerName
+      feedObj.ownerEmail = feedOptions.ownerEmail
+    }
+
     return {
-      id: oldFeed.id,
-      slug: oldFeed.slug,
-      entityType: oldFeed.entityType,
-      entityId: oldFeed.entityId,
-      entityUpdatedAt: oldFeed.entityUpdatedAt,
-      serverAddress: oldFeed.serverAddress,
-      feedURL: oldFeed.feedUrl,
-      coverPath: oldFeed.coverPath || null,
-      imageURL: oldFeedMeta.imageUrl,
-      siteURL: oldFeedMeta.link,
-      title: oldFeedMeta.title,
-      description: oldFeedMeta.description,
-      author: oldFeedMeta.author,
-      podcastType: oldFeedMeta.type || null,
-      language: oldFeedMeta.language || null,
-      ownerName: oldFeedMeta.ownerName || null,
-      ownerEmail: oldFeedMeta.ownerEmail || null,
-      explicit: !!oldFeedMeta.explicit,
-      preventIndexing: !!oldFeedMeta.preventIndexing,
-      userId: oldFeed.userId
+      feedObj,
+      booksWithTracks
     }
   }
 
-  getEntity(options) {
-    if (!this.entityType) return Promise.resolve(null)
-    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.entityType)}`
-    return this[mixinMethodName](options)
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Collection')} collectionExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions) {
+    const { feedObj, booksWithTracks } = this.getFeedObjForCollection(userId, collectionExpanded, slug, serverAddress, feedOptions)
+
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
+
+    const transaction = await this.sequelize.transaction()
+    try {
+      const feed = await this.create(feedObj, { transaction })
+      feed.feedEpisodes = await feedEpisodeModel.createFromBooks(booksWithTracks, feed, slug, transaction)
+
+      await transaction.commit()
+
+      return feed
+    } catch (error) {
+      Logger.error(`[Feed] Error creating feed for collection ${collectionExpanded.id}`, error)
+      await transaction.rollback()
+      return null
+    }
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Series')} seriesExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} [feedOptions=null]
+   *
+   * @returns {{ feedObj: Feed, booksWithTracks: import('./Book').BookExpandedWithLibraryItem[] }}
+   */
+  static getFeedObjForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions = null) {
+    const booksWithTracks = seriesExpanded.books.filter((book) => book.includedAudioFiles.length)
+    const entityUpdatedAt = booksWithTracks.reduce((mostRecent, book) => {
+      return book.libraryItem.updatedAt > mostRecent ? book.libraryItem.updatedAt : mostRecent
+    }, seriesExpanded.updatedAt)
+
+    const firstBookWithCover = booksWithTracks.find((book) => book.coverPath)
+
+    const allBookAuthorNames = booksWithTracks.reduce((authorNames, book) => {
+      const bookAuthorsToAdd = book.authors.filter((author) => !authorNames.includes(author.name)).map((author) => author.name)
+      return authorNames.concat(bookAuthorsToAdd)
+    }, [])
+    let author = allBookAuthorNames.slice(0, 3).join(', ')
+    if (allBookAuthorNames.length > 3) {
+      author += ' & more'
+    }
+
+    const feedObj = {
+      slug,
+      entityType: 'series',
+      entityId: seriesExpanded.id,
+      entityUpdatedAt,
+      serverAddress,
+      feedURL: `/feed/${slug}`,
+      imageURL: firstBookWithCover?.coverPath ? `/feed/${slug}/cover${Path.extname(firstBookWithCover.coverPath)}` : `/Logo.png`,
+      siteURL: `/library/${booksWithTracks[0].libraryItem.libraryId}/series/${seriesExpanded.id}`,
+      title: seriesExpanded.name,
+      description: seriesExpanded.description || '',
+      author,
+      podcastType: 'serial',
+      explicit: booksWithTracks.some((book) => book.explicit), // If any book is explicit, the feed is explicit
+      coverPath: firstBookWithCover?.coverPath || null,
+      userId
+    }
+
+    if (feedOptions) {
+      feedObj.preventIndexing = feedOptions.preventIndexing
+      feedObj.ownerName = feedOptions.ownerName
+      feedObj.ownerEmail = feedOptions.ownerEmail
+    }
+
+    return {
+      feedObj,
+      booksWithTracks
+    }
+  }
+
+  /**
+   *
+   * @param {string} userId
+   * @param {import('./Series')} seriesExpanded
+   * @param {string} slug
+   * @param {string} serverAddress
+   * @param {FeedOptions} feedOptions
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  static async createFeedForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions) {
+    const { feedObj, booksWithTracks } = this.getFeedObjForSeries(userId, seriesExpanded, slug, serverAddress, feedOptions)
+
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
+
+    const transaction = await this.sequelize.transaction()
+    try {
+      const feed = await this.create(feedObj, { transaction })
+      feed.feedEpisodes = await feedEpisodeModel.createFromBooks(booksWithTracks, feed, slug, transaction)
+
+      await transaction.commit()
+
+      return feed
+    } catch (error) {
+      Logger.error(`[Feed] Error creating feed for series ${seriesExpanded.id}`, error)
+      await transaction.rollback()
+      return null
+    }
   }
 
   /**
@@ -369,6 +463,192 @@ class Feed extends Model {
       }
     })
   }
+
+  /**
+   *
+   * @returns {Promise<FeedExpanded>}
+   */
+  async updateFeedForEntity() {
+    /** @type {typeof import('./FeedEpisode')} */
+    const feedEpisodeModel = this.sequelize.models.feedEpisode
+
+    let feedObj = null
+    let feedEpisodeCreateFunc = null
+    let feedEpisodeCreateFuncEntity = null
+
+    if (this.entityType === 'libraryItem') {
+      /** @type {typeof import('./LibraryItem')} */
+      const libraryItemModel = this.sequelize.models.libraryItem
+
+      const itemExpanded = await libraryItemModel.getExpandedById(this.entityId)
+      feedObj = Feed.getFeedObjForLibraryItem(this.userId, itemExpanded, this.slug, this.serverAddress)
+
+      feedEpisodeCreateFuncEntity = itemExpanded
+      if (itemExpanded.mediaType === 'podcast') {
+        feedEpisodeCreateFunc = feedEpisodeModel.createFromPodcastEpisodes.bind(feedEpisodeModel)
+      } else {
+        feedEpisodeCreateFunc = feedEpisodeModel.createFromAudiobookTracks.bind(feedEpisodeModel)
+      }
+    } else if (this.entityType === 'collection') {
+      /** @type {typeof import('./Collection')} */
+      const collectionModel = this.sequelize.models.collection
+
+      const collectionExpanded = await collectionModel.getExpandedById(this.entityId)
+      const feedObjData = Feed.getFeedObjForCollection(this.userId, collectionExpanded, this.slug, this.serverAddress)
+      feedObj = feedObjData.feedObj
+      feedEpisodeCreateFuncEntity = feedObjData.booksWithTracks
+      feedEpisodeCreateFunc = feedEpisodeModel.createFromBooks.bind(feedEpisodeModel)
+    } else if (this.entityType === 'series') {
+      /** @type {typeof import('./Series')} */
+      const seriesModel = this.sequelize.models.series
+
+      const seriesExpanded = await seriesModel.getExpandedById(this.entityId)
+      const feedObjData = Feed.getFeedObjForSeries(this.userId, seriesExpanded, this.slug, this.serverAddress)
+      feedObj = feedObjData.feedObj
+      feedEpisodeCreateFuncEntity = feedObjData.booksWithTracks
+      feedEpisodeCreateFunc = feedEpisodeModel.createFromBooks.bind(feedEpisodeModel)
+    } else {
+      Logger.error(`[Feed] Invalid entity type ${this.entityType} for feed ${this.id}`)
+      return null
+    }
+
+    const transaction = await this.sequelize.transaction()
+    try {
+      const updatedFeed = await this.update(feedObj, { transaction })
+
+      // Remove existing feed episodes
+      await feedEpisodeModel.destroy({
+        where: {
+          feedId: this.id
+        },
+        transaction
+      })
+
+      // Create new feed episodes
+      updatedFeed.feedEpisodes = await feedEpisodeCreateFunc(feedEpisodeCreateFuncEntity, updatedFeed, this.slug, transaction)
+
+      await transaction.commit()
+
+      return updatedFeed
+    } catch (error) {
+      Logger.error(`[Feed] Error updating feed ${this.entityId}`, error)
+      await transaction.rollback()
+
+      return null
+    }
+  }
+
+  getEntity(options) {
+    if (!this.entityType) return Promise.resolve(null)
+    const mixinMethodName = `get${this.sequelize.uppercaseFirst(this.entityType)}`
+    return this[mixinMethodName](options)
+  }
+
+  /**
+   *
+   * @param {string} hostPrefix
+   */
+  buildXml(hostPrefix) {
+    const blockTags = [{ 'itunes:block': 'yes' }, { 'googleplay:block': 'yes' }]
+    const rssData = {
+      title: this.title,
+      description: this.description || '',
+      generator: 'Audiobookshelf',
+      feed_url: `${hostPrefix}${this.feedURL}`,
+      site_url: `${hostPrefix}${this.siteURL}`,
+      image_url: `${hostPrefix}${this.imageURL}`,
+      custom_namespaces: {
+        itunes: 'http://www.itunes.com/dtds/podcast-1.0.dtd',
+        psc: 'http://podlove.org/simple-chapters',
+        podcast: 'https://podcastindex.org/namespace/1.0',
+        googleplay: 'http://www.google.com/schemas/play-podcasts/1.0'
+      },
+      custom_elements: [
+        { language: this.language || 'en' },
+        { author: this.author || 'advplyr' },
+        { 'itunes:author': this.author || 'advplyr' },
+        { 'itunes:summary': this.description || '' },
+        { 'itunes:type': this.podcastType },
+        {
+          'itunes:image': {
+            _attr: {
+              href: `${hostPrefix}${this.imageURL}`
+            }
+          }
+        },
+        {
+          'itunes:owner': [{ 'itunes:name': this.ownerName || this.author || '' }, { 'itunes:email': this.ownerEmail || '' }]
+        },
+        { 'itunes:explicit': !!this.explicit },
+        ...(this.preventIndexing ? blockTags : [])
+      ]
+    }
+
+    const rssfeed = new RSS(rssData)
+    this.feedEpisodes.forEach((ep) => {
+      rssfeed.item(ep.getRSSData(hostPrefix))
+    })
+    return rssfeed.xml()
+  }
+
+  /**
+   *
+   * @param {string} id
+   * @returns {string}
+   */
+  getEpisodePath(id) {
+    const episode = this.feedEpisodes.find((ep) => ep.id === id)
+    if (!episode) return null
+    return episode.filePath
+  }
+
+  toOldJSON() {
+    const episodes = this.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode())
+    return {
+      id: this.id,
+      slug: this.slug,
+      userId: this.userId,
+      entityType: this.entityType,
+      entityId: this.entityId,
+      entityUpdatedAt: this.entityUpdatedAt?.valueOf() || null,
+      coverPath: this.coverPath || null,
+      meta: {
+        title: this.title,
+        description: this.description,
+        author: this.author,
+        imageUrl: this.imageURL,
+        feedUrl: this.feedURL,
+        link: this.siteURL,
+        explicit: this.explicit,
+        type: this.podcastType,
+        language: this.language,
+        preventIndexing: this.preventIndexing,
+        ownerName: this.ownerName,
+        ownerEmail: this.ownerEmail
+      },
+      serverAddress: this.serverAddress,
+      feedUrl: this.feedURL,
+      episodes: episodes || [],
+      createdAt: this.createdAt.valueOf(),
+      updatedAt: this.updatedAt.valueOf()
+    }
+  }
+
+  toOldJSONMinified() {
+    return {
+      id: this.id,
+      entityType: this.entityType,
+      entityId: this.entityId,
+      feedUrl: this.feedURL,
+      meta: {
+        title: this.title,
+        description: this.description,
+        preventIndexing: this.preventIndexing,
+        ownerName: this.ownerName,
+        ownerEmail: this.ownerEmail
+      }
+    }
+  }
 }
 
 module.exports = Feed
diff --git a/server/models/FeedEpisode.js b/server/models/FeedEpisode.js
index 442cc165c..3bf0ff851 100644
--- a/server/models/FeedEpisode.js
+++ b/server/models/FeedEpisode.js
@@ -1,4 +1,9 @@
+const Path = require('path')
 const { DataTypes, Model } = require('sequelize')
+const uuidv4 = require('uuid').v4
+const Logger = require('../Logger')
+const date = require('../libs/dateAndTime')
+const { secondsToTimestamp } = require('../utils')
 
 class FeedEpisode extends Model {
   constructor(values, options) {
@@ -9,6 +14,8 @@ class FeedEpisode extends Model {
     /** @type {string} */
     this.title
     /** @type {string} */
+    this.author
+    /** @type {string} */
     this.description
     /** @type {string} */
     this.siteURL
@@ -40,60 +47,167 @@ class FeedEpisode extends Model {
     this.updatedAt
   }
 
-  getOldEpisode() {
-    const enclosure = {
-      url: this.enclosureURL,
-      size: this.enclosureSize,
-      type: this.enclosureType
-    }
+  /**
+   *
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('./PodcastEpisode')} episode
+   */
+  static getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode) {
+    const episodeId = uuidv4()
     return {
-      id: this.id,
-      title: this.title,
-      description: this.description,
-      enclosure,
-      pubDate: this.pubDate,
-      link: this.siteURL,
-      author: this.author,
-      explicit: this.explicit,
-      duration: this.duration,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      fullPath: this.filePath
+      id: episodeId,
+      title: episode.title,
+      author: feed.author,
+      description: episode.description,
+      siteURL: feed.siteURL,
+      enclosureURL: `/feed/${slug}/item/${episodeId}/media${Path.extname(episode.audioFile.metadata.filename)}`,
+      enclosureType: episode.audioFile.mimeType,
+      enclosureSize: episode.audioFile.metadata.size,
+      pubDate: episode.pubDate,
+      season: episode.season,
+      episode: episode.episode,
+      episodeType: episode.episodeType,
+      duration: episode.audioFile.duration,
+      filePath: episode.audioFile.metadata.path,
+      explicit: libraryItemExpanded.media.explicit,
+      feedId: feed.id
     }
   }
 
   /**
-   * Create feed episode from old model
    *
-   * @param {string} feedId
-   * @param {Object} oldFeedEpisode
-   * @returns {Promise<FeedEpisode>}
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('sequelize').Transaction} transaction
+   * @returns {Promise<FeedEpisode[]>}
    */
-  static createFromOld(feedId, oldFeedEpisode) {
-    const newEpisode = this.getFromOld(oldFeedEpisode)
-    newEpisode.feedId = feedId
-    return this.create(newEpisode)
+  static async createFromPodcastEpisodes(libraryItemExpanded, feed, slug, transaction) {
+    const feedEpisodeObjs = []
+
+    // Sort podcastEpisodes by pubDate. episodic is newest to oldest. serial is oldest to newest.
+    if (feed.podcastType === 'episodic') {
+      libraryItemExpanded.media.podcastEpisodes.sort((a, b) => new Date(b.pubDate) - new Date(a.pubDate))
+    } else {
+      libraryItemExpanded.media.podcastEpisodes.sort((a, b) => new Date(a.pubDate) - new Date(b.pubDate))
+    }
+
+    for (const episode of libraryItemExpanded.media.podcastEpisodes) {
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromPodcastEpisode(libraryItemExpanded, feed, slug, episode))
+    }
+    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction })
   }
 
-  static getFromOld(oldFeedEpisode) {
-    return {
-      id: oldFeedEpisode.id,
-      title: oldFeedEpisode.title,
-      author: oldFeedEpisode.author,
-      description: oldFeedEpisode.description,
-      siteURL: oldFeedEpisode.link,
-      enclosureURL: oldFeedEpisode.enclosure?.url || null,
-      enclosureType: oldFeedEpisode.enclosure?.type || null,
-      enclosureSize: oldFeedEpisode.enclosure?.size || null,
-      pubDate: oldFeedEpisode.pubDate,
-      season: oldFeedEpisode.season || null,
-      episode: oldFeedEpisode.episode || null,
-      episodeType: oldFeedEpisode.episodeType || null,
-      duration: oldFeedEpisode.duration,
-      filePath: oldFeedEpisode.fullPath,
-      explicit: !!oldFeedEpisode.explicit
+  /**
+   * If chapters for an audiobook match the audio tracks then use chapter titles instead of audio file names
+   *
+   * @param {import('./Book')} book
+   * @returns {boolean}
+   */
+  static checkUseChapterTitlesForEpisodes(book) {
+    const tracks = book.trackList || []
+    const chapters = book.chapters || []
+    if (tracks.length !== chapters.length) return false
+    for (let i = 0; i < tracks.length; i++) {
+      if (Math.abs(chapters[i].start - tracks[i].startOffset) >= 1) {
+        return false
+      }
     }
+    return true
+  }
+
+  /**
+   *
+   * @param {import('./Book')} book
+   * @param {Date} pubDateStart
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('./Book').AudioFileObject} audioTrack
+   * @param {boolean} useChapterTitles
+   */
+  static getFeedEpisodeObjFromAudiobookTrack(book, pubDateStart, feed, slug, audioTrack, useChapterTitles) {
+    // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
+    let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
+    let episodeId = uuidv4()
+
+    // e.g. Track 1 will have a pub date before Track 2
+    const audiobookPubDate = date.format(new Date(pubDateStart.valueOf() + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
+
+    const contentUrl = `/feed/${slug}/item/${episodeId}/media${Path.extname(audioTrack.metadata.filename)}`
+
+    let title = audioTrack.title
+    if (book.trackList.length == 1) {
+      // If audiobook is a single file, use book title instead of chapter/file title
+      title = book.title
+    } else {
+      if (useChapterTitles) {
+        // If audio track start and chapter start are within 1 seconds of eachother then use the chapter title
+        const matchingChapter = book.chapters.find((ch) => Math.abs(ch.start - audioTrack.startOffset) < 1)
+        if (matchingChapter?.title) title = matchingChapter.title
+      }
+    }
+
+    return {
+      id: episodeId,
+      title,
+      author: feed.author,
+      description: book.description || '',
+      siteURL: feed.siteURL,
+      enclosureURL: contentUrl,
+      enclosureType: audioTrack.mimeType,
+      enclosureSize: audioTrack.metadata.size,
+      pubDate: audiobookPubDate,
+      duration: audioTrack.duration,
+      filePath: audioTrack.metadata.path,
+      explicit: book.explicit,
+      feedId: feed.id
+    }
+  }
+
+  /**
+   *
+   * @param {import('./LibraryItem').LibraryItemExpanded} libraryItemExpanded
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('sequelize').Transaction} transaction
+   * @returns {Promise<FeedEpisode[]>}
+   */
+  static async createFromAudiobookTracks(libraryItemExpanded, feed, slug, transaction) {
+    const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItemExpanded.media)
+
+    const feedEpisodeObjs = []
+    for (const track of libraryItemExpanded.media.trackList) {
+      feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(libraryItemExpanded.media, libraryItemExpanded.createdAt, feed, slug, track, useChapterTitles))
+    }
+    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction })
+  }
+
+  /**
+   *
+   * @param {import('./Book')[]} books
+   * @param {import('./Feed')} feed
+   * @param {string} slug
+   * @param {import('sequelize').Transaction} transaction
+   * @returns {Promise<FeedEpisode[]>}
+   */
+  static async createFromBooks(books, feed, slug, transaction) {
+    const earliestLibraryItemCreatedAt = books.reduce((earliest, book) => {
+      return book.libraryItem.createdAt < earliest.libraryItem.createdAt ? book : earliest
+    }).libraryItem.createdAt
+
+    const feedEpisodeObjs = []
+    for (const book of books) {
+      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(book)
+      for (const track of book.trackList) {
+        feedEpisodeObjs.push(this.getFeedEpisodeObjFromAudiobookTrack(book, earliestLibraryItemCreatedAt, feed, slug, track, useChapterTitles))
+      }
+    }
+    Logger.info(`[FeedEpisode] Creating ${feedEpisodeObjs.length} episodes for feed ${feed.id}`)
+    return this.bulkCreate(feedEpisodeObjs, { transaction })
   }
 
   /**
@@ -136,6 +250,60 @@ class FeedEpisode extends Model {
     })
     FeedEpisode.belongsTo(feed)
   }
+
+  getOldEpisode() {
+    const enclosure = {
+      url: this.enclosureURL,
+      size: this.enclosureSize,
+      type: this.enclosureType
+    }
+    return {
+      id: this.id,
+      title: this.title,
+      description: this.description,
+      enclosure,
+      pubDate: this.pubDate,
+      link: this.siteURL,
+      author: this.author,
+      explicit: this.explicit,
+      duration: this.duration,
+      season: this.season,
+      episode: this.episode,
+      episodeType: this.episodeType,
+      fullPath: this.filePath
+    }
+  }
+
+  /**
+   *
+   * @param {string} hostPrefix
+   */
+  getRSSData(hostPrefix) {
+    return {
+      title: this.title,
+      description: this.description || '',
+      url: `${hostPrefix}${this.siteURL}`,
+      guid: `${hostPrefix}${this.enclosureURL}`,
+      author: this.author,
+      date: this.pubDate,
+      enclosure: {
+        url: `${hostPrefix}${this.enclosureURL}`,
+        type: this.enclosureType,
+        size: this.enclosureSize
+      },
+      custom_elements: [
+        { 'itunes:author': this.author },
+        { 'itunes:duration': secondsToTimestamp(this.duration) },
+        { 'itunes:summary': this.description || '' },
+        {
+          'itunes:explicit': !!this.explicit
+        },
+        { 'itunes:episodeType': this.episodeType },
+        { 'itunes:season': this.season },
+        { 'itunes:episode': this.episode }
+      ]
+    }
+  }
 }
 
 module.exports = FeedEpisode
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index 10395c49c..8ebed1d50 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -73,6 +73,9 @@ class LibraryItem extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
+
+    /** @type {Book.BookExpanded|Podcast.PodcastExpanded} - only set when expanded */
+    this.media
   }
 
   /**
@@ -565,7 +568,7 @@ class LibraryItem extends Model {
           oldLibraryItem.media.metadata.series = li.series
         }
         if (li.rssFeed) {
-          oldLibraryItem.rssFeed = this.sequelize.models.feed.getOldFeed(li.rssFeed).toJSONMinified()
+          oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
         if (li.media.numEpisodes) {
           oldLibraryItem.media.numEpisodes = li.media.numEpisodes
@@ -1124,6 +1127,24 @@ class LibraryItem extends Model {
       }
     })
   }
+
+  /**
+   * Check if book or podcast library item has audio tracks
+   * Requires expanded library item
+   *
+   * @returns {boolean}
+   */
+  hasAudioTracks() {
+    if (!this.media) {
+      Logger.error(`[LibraryItem] hasAudioTracks: Library item "${this.id}" does not have media`)
+      return false
+    }
+    if (this.mediaType === 'book') {
+      return this.media.audioFiles?.length > 0
+    } else {
+      return this.media.podcastEpisodes?.length > 0
+    }
+  }
 }
 
 module.exports = LibraryItem
diff --git a/server/models/Playlist.js b/server/models/Playlist.js
index fbc5f96aa..490e80876 100644
--- a/server/models/Playlist.js
+++ b/server/models/Playlist.js
@@ -84,13 +84,6 @@ class Playlist extends Model {
 
     const playlistExpanded = oldPlaylist.toJSONExpanded(libraryItems)
 
-    if (include?.includes('rssfeed')) {
-      const feeds = await this.getFeeds()
-      if (feeds?.length) {
-        playlistExpanded.rssFeed = this.sequelize.models.feed.getOldFeed(feeds[0])
-      }
-    }
-
     return playlistExpanded
   }
 
diff --git a/server/models/Series.js b/server/models/Series.js
index 731908e9c..c4bc1594c 100644
--- a/server/models/Series.js
+++ b/server/models/Series.js
@@ -1,4 +1,4 @@
-const { DataTypes, Model, where, fn, col } = require('sequelize')
+const { DataTypes, Model, where, fn, col, literal } = require('sequelize')
 
 const { getTitlePrefixAtEnd } = require('../utils/index')
 
@@ -20,6 +20,11 @@ class Series extends Model {
     this.createdAt
     /** @type {Date} */
     this.updatedAt
+
+    // Expanded properties
+
+    /** @type {import('./Book').BookExpandedWithLibraryItem[]} - only set when expanded */
+    this.books
   }
 
   /**
@@ -49,6 +54,18 @@ class Series extends Model {
     })
   }
 
+  /**
+   *
+   * @param {string} seriesId
+   * @returns {Promise<Series>}
+   */
+  static async getExpandedById(seriesId) {
+    const series = await this.findByPk(seriesId)
+    if (!series) return null
+    series.books = await series.getBooksExpandedWithLibraryItem()
+    return series
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize
@@ -103,6 +120,35 @@ class Series extends Model {
     Series.belongsTo(library)
   }
 
+  /**
+   * Get all books in collection expanded with library item
+   *
+   * @returns {Promise<import('./Book').BookExpandedWithLibraryItem[]>}
+   */
+  getBooksExpandedWithLibraryItem() {
+    return this.getBooks({
+      joinTableAttributes: ['sequence'],
+      include: [
+        {
+          model: this.sequelize.models.libraryItem
+        },
+        {
+          model: this.sequelize.models.author,
+          through: {
+            attributes: []
+          }
+        },
+        {
+          model: this.sequelize.models.series,
+          through: {
+            attributes: ['sequence']
+          }
+        }
+      ],
+      order: [[literal('CAST(`bookSeries.sequence` AS FLOAT) ASC NULLS LAST')]]
+    })
+  }
+
   toOldJSON() {
     return {
       id: this.id,
diff --git a/server/objects/Feed.js b/server/objects/Feed.js
deleted file mode 100644
index ac50b899f..000000000
--- a/server/objects/Feed.js
+++ /dev/null
@@ -1,418 +0,0 @@
-const Path = require('path')
-const uuidv4 = require('uuid').v4
-const FeedMeta = require('./FeedMeta')
-const FeedEpisode = require('./FeedEpisode')
-
-const date = require('../libs/dateAndTime')
-const RSS = require('../libs/rss')
-const { createNewSortInstance } = require('../libs/fastSort')
-const naturalSort = createNewSortInstance({
-  comparer: new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare
-})
-
-class Feed {
-  constructor(feed) {
-    this.id = null
-    this.slug = null
-    this.userId = null
-    this.entityType = null
-    this.entityId = null
-    this.entityUpdatedAt = null
-
-    this.coverPath = null
-    this.serverAddress = null
-    this.feedUrl = null
-
-    this.meta = null
-    this.episodes = null
-
-    this.createdAt = null
-    this.updatedAt = null
-
-    if (feed) {
-      this.construct(feed)
-    }
-  }
-
-  construct(feed) {
-    this.id = feed.id
-    this.slug = feed.slug
-    this.userId = feed.userId
-    this.entityType = feed.entityType
-    this.entityId = feed.entityId
-    this.entityUpdatedAt = feed.entityUpdatedAt
-    this.coverPath = feed.coverPath
-    this.serverAddress = feed.serverAddress
-    this.feedUrl = feed.feedUrl
-    this.meta = new FeedMeta(feed.meta)
-    this.episodes = feed.episodes.map((ep) => new FeedEpisode(ep))
-    this.createdAt = feed.createdAt
-    this.updatedAt = feed.updatedAt
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      slug: this.slug,
-      userId: this.userId,
-      entityType: this.entityType,
-      entityId: this.entityId,
-      coverPath: this.coverPath,
-      serverAddress: this.serverAddress,
-      feedUrl: this.feedUrl,
-      meta: this.meta.toJSON(),
-      episodes: this.episodes.map((ep) => ep.toJSON()),
-      createdAt: this.createdAt,
-      updatedAt: this.updatedAt
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      id: this.id,
-      entityType: this.entityType,
-      entityId: this.entityId,
-      feedUrl: this.feedUrl,
-      meta: this.meta.toJSONMinified()
-    }
-  }
-
-  getEpisodePath(id) {
-    var episode = this.episodes.find((ep) => ep.id === id)
-    if (!episode) return null
-    return episode.fullPath
-  }
-
-  /**
-   * If chapters for an audiobook match the audio tracks then use chapter titles instead of audio file names
-   *
-   * @param {import('../objects/LibraryItem')} libraryItem
-   * @returns {boolean}
-   */
-  checkUseChapterTitlesForEpisodes(libraryItem) {
-    const tracks = libraryItem.media.tracks
-    const chapters = libraryItem.media.chapters
-    if (tracks.length !== chapters.length) return false
-    for (let i = 0; i < tracks.length; i++) {
-      if (Math.abs(chapters[i].start - tracks[i].startOffset) >= 1) {
-        return false
-      }
-    }
-    return true
-  }
-
-  setFromItem(userId, slug, libraryItem, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-    const isPodcast = libraryItem.mediaType === 'podcast'
-
-    const feedUrl = `/feed/${slug}`
-    const author = isPodcast ? mediaMetadata.author : mediaMetadata.authorName
-
-    this.id = uuidv4()
-    this.slug = slug
-    this.userId = userId
-    this.entityType = 'libraryItem'
-    this.entityId = libraryItem.id
-    this.entityUpdatedAt = libraryItem.updatedAt
-    this.coverPath = media.coverPath || null
-    this.serverAddress = serverAddress
-    this.feedUrl = feedUrl
-
-    const coverFileExtension = this.coverPath ? Path.extname(media.coverPath) : null
-
-    this.meta = new FeedMeta()
-    this.meta.title = mediaMetadata.title
-    this.meta.description = mediaMetadata.description
-    this.meta.author = author
-    this.meta.imageUrl = media.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.feedUrl = feedUrl
-    this.meta.link = `/item/${libraryItem.id}`
-    this.meta.explicit = !!mediaMetadata.explicit
-    this.meta.type = mediaMetadata.type
-    this.meta.language = mediaMetadata.language
-    this.meta.preventIndexing = preventIndexing
-    this.meta.ownerName = ownerName
-    this.meta.ownerEmail = ownerEmail
-
-    this.episodes = []
-    if (isPodcast) {
-      // PODCAST EPISODES
-      media.episodes.forEach((episode) => {
-        if (episode.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = episode.updatedAt
-
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromPodcastEpisode(libraryItem, serverAddress, slug, episode, this.meta)
-        this.episodes.push(feedEpisode)
-      })
-    } else {
-      // AUDIOBOOK EPISODES
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItem)
-      media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromAudiobookTrack(libraryItem, serverAddress, slug, audioTrack, this.meta, useChapterTitles)
-        this.episodes.push(feedEpisode)
-      })
-    }
-
-    this.createdAt = Date.now()
-    this.updatedAt = Date.now()
-  }
-
-  updateFromItem(libraryItem) {
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-    const isPodcast = libraryItem.mediaType === 'podcast'
-    const author = isPodcast ? mediaMetadata.author : mediaMetadata.authorName
-
-    this.entityUpdatedAt = libraryItem.updatedAt
-    this.coverPath = media.coverPath || null
-
-    const coverFileExtension = this.coverPath ? Path.extname(media.coverPath) : null
-
-    this.meta.title = mediaMetadata.title
-    this.meta.description = mediaMetadata.description
-    this.meta.author = author
-    this.meta.imageUrl = media.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.explicit = !!mediaMetadata.explicit
-    this.meta.type = mediaMetadata.type
-    this.meta.language = mediaMetadata.language
-
-    this.episodes = []
-    if (isPodcast) {
-      // PODCAST EPISODES
-      media.episodes.forEach((episode) => {
-        if (episode.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = episode.updatedAt
-
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromPodcastEpisode(libraryItem, this.serverAddress, this.slug, episode, this.meta)
-        this.episodes.push(feedEpisode)
-      })
-    } else {
-      // AUDIOBOOK EPISODES
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(libraryItem)
-      media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-        feedEpisode.setFromAudiobookTrack(libraryItem, this.serverAddress, this.slug, audioTrack, this.meta, useChapterTitles)
-        this.episodes.push(feedEpisode)
-      })
-    }
-
-    this.updatedAt = Date.now()
-  }
-
-  setFromCollection(userId, slug, collectionExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const feedUrl = `/feed/${slug}`
-
-    const itemsWithTracks = collectionExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)
-
-    this.id = uuidv4()
-    this.slug = slug
-    this.userId = userId
-    this.entityType = 'collection'
-    this.entityId = collectionExpanded.id
-    this.entityUpdatedAt = collectionExpanded.lastUpdate // This will be set to the most recently updated library item
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-    this.serverAddress = serverAddress
-    this.feedUrl = feedUrl
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta = new FeedMeta()
-    this.meta.title = collectionExpanded.name
-    this.meta.description = collectionExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.feedUrl = feedUrl
-    this.meta.link = `/collection/${collectionExpanded.id}`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-    this.meta.preventIndexing = preventIndexing
-    this.meta.ownerName = ownerName
-    this.meta.ownerEmail = ownerEmail
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, serverAddress, slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.createdAt = Date.now()
-    this.updatedAt = Date.now()
-  }
-
-  updateFromCollection(collectionExpanded) {
-    const itemsWithTracks = collectionExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)
-
-    this.entityUpdatedAt = collectionExpanded.lastUpdate
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta.title = collectionExpanded.name
-    this.meta.description = collectionExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, this.serverAddress, this.slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.updatedAt = Date.now()
-  }
-
-  setFromSeries(userId, slug, seriesExpanded, serverAddress, preventIndexing = true, ownerName = null, ownerEmail = null) {
-    const feedUrl = `/feed/${slug}`
-
-    let itemsWithTracks = seriesExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    // Sort series items by series sequence
-    itemsWithTracks = naturalSort(itemsWithTracks).asc((li) => li.media.metadata.getSeriesSequence(seriesExpanded.id))
-
-    const libraryId = itemsWithTracks[0].libraryId
-    const firstItemWithCover = itemsWithTracks.find((li) => li.media.coverPath)
-
-    this.id = uuidv4()
-    this.slug = slug
-    this.userId = userId
-    this.entityType = 'series'
-    this.entityId = seriesExpanded.id
-    this.entityUpdatedAt = seriesExpanded.updatedAt // This will be set to the most recently updated library item
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-    this.serverAddress = serverAddress
-    this.feedUrl = feedUrl
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta = new FeedMeta()
-    this.meta.title = seriesExpanded.name
-    this.meta.description = seriesExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.feedUrl = feedUrl
-    this.meta.link = `/library/${libraryId}/series/${seriesExpanded.id}`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-    this.meta.preventIndexing = preventIndexing
-    this.meta.ownerName = ownerName
-    this.meta.ownerEmail = ownerEmail
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, serverAddress, slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.createdAt = Date.now()
-    this.updatedAt = Date.now()
-  }
-
-  updateFromSeries(seriesExpanded) {
-    let itemsWithTracks = seriesExpanded.books.filter((libraryItem) => libraryItem.media.tracks.length)
-    // Sort series items by series sequence
-    itemsWithTracks = naturalSort(itemsWithTracks).asc((li) => li.media.metadata.getSeriesSequence(seriesExpanded.id))
-
-    const firstItemWithCover = itemsWithTracks.find((item) => item.media.coverPath)
-
-    this.entityUpdatedAt = seriesExpanded.updatedAt
-    this.coverPath = firstItemWithCover?.media.coverPath || null
-
-    const coverFileExtension = this.coverPath ? Path.extname(this.coverPath) : null
-
-    this.meta.title = seriesExpanded.name
-    this.meta.description = seriesExpanded.description || ''
-    this.meta.author = this.getAuthorsStringFromLibraryItems(itemsWithTracks)
-    this.meta.imageUrl = this.coverPath ? `/feed/${this.slug}/cover${coverFileExtension}` : `/Logo.png`
-    this.meta.explicit = !!itemsWithTracks.some((li) => li.media.metadata.explicit) // explicit if any item is explicit
-
-    this.episodes = []
-
-    // Used for calculating pubdate
-    const earliestItemAddedAt = itemsWithTracks.reduce((earliest, item) => (item.addedAt < earliest ? item.addedAt : earliest), itemsWithTracks[0].addedAt)
-
-    itemsWithTracks.forEach((item, index) => {
-      if (item.updatedAt > this.entityUpdatedAt) this.entityUpdatedAt = item.updatedAt
-
-      const useChapterTitles = this.checkUseChapterTitlesForEpisodes(item)
-      item.media.tracks.forEach((audioTrack) => {
-        const feedEpisode = new FeedEpisode()
-
-        // Offset pubdate to ensure correct order
-        let trackTimeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset track
-        trackTimeOffset += index * 1000 // Offset item
-        const episodePubDateOverride = date.format(new Date(earliestItemAddedAt + trackTimeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-        feedEpisode.setFromAudiobookTrack(item, this.serverAddress, this.slug, audioTrack, this.meta, useChapterTitles, episodePubDateOverride)
-        this.episodes.push(feedEpisode)
-      })
-    })
-
-    this.updatedAt = Date.now()
-  }
-
-  buildXml(originalHostPrefix) {
-    var rssfeed = new RSS(this.meta.getRSSData(originalHostPrefix))
-    this.episodes.forEach((ep) => {
-      rssfeed.item(ep.getRSSData(originalHostPrefix))
-    })
-    return rssfeed.xml()
-  }
-
-  getAuthorsStringFromLibraryItems(libraryItems) {
-    let itemAuthors = []
-    libraryItems.forEach((item) => itemAuthors.push(...item.media.metadata.authors.map((au) => au.name)))
-    itemAuthors = [...new Set(itemAuthors)] // Filter out dupes
-    let author = itemAuthors.slice(0, 3).join(', ')
-    if (itemAuthors.length > 3) {
-      author += ' & more'
-    }
-    return author
-  }
-}
-module.exports = Feed
diff --git a/server/objects/FeedEpisode.js b/server/objects/FeedEpisode.js
deleted file mode 100644
index 13d590ff7..000000000
--- a/server/objects/FeedEpisode.js
+++ /dev/null
@@ -1,181 +0,0 @@
-const Path = require('path')
-const uuidv4 = require('uuid').v4
-const date = require('../libs/dateAndTime')
-const { secondsToTimestamp } = require('../utils/index')
-
-class FeedEpisode {
-  constructor(episode) {
-    this.id = null
-
-    this.title = null
-    this.description = null
-    this.enclosure = null
-    this.pubDate = null
-    this.link = null
-    this.author = null
-    this.explicit = null
-    this.duration = null
-    this.season = null
-    this.episode = null
-    this.episodeType = null
-
-    this.libraryItemId = null
-    this.episodeId = null
-    this.trackIndex = null
-    this.fullPath = null
-
-    if (episode) {
-      this.construct(episode)
-    }
-  }
-
-  construct(episode) {
-    this.id = episode.id
-    this.title = episode.title
-    this.description = episode.description
-    this.enclosure = episode.enclosure ? { ...episode.enclosure } : null
-    this.pubDate = episode.pubDate
-    this.link = episode.link
-    this.author = episode.author
-    this.explicit = episode.explicit
-    this.duration = episode.duration
-    this.season = episode.season
-    this.episode = episode.episode
-    this.episodeType = episode.episodeType
-    this.libraryItemId = episode.libraryItemId
-    this.episodeId = episode.episodeId || null
-    this.trackIndex = episode.trackIndex || 0
-    this.fullPath = episode.fullPath
-  }
-
-  toJSON() {
-    return {
-      id: this.id,
-      title: this.title,
-      description: this.description,
-      enclosure: this.enclosure ? { ...this.enclosure } : null,
-      pubDate: this.pubDate,
-      link: this.link,
-      author: this.author,
-      explicit: this.explicit,
-      duration: this.duration,
-      season: this.season,
-      episode: this.episode,
-      episodeType: this.episodeType,
-      libraryItemId: this.libraryItemId,
-      episodeId: this.episodeId,
-      trackIndex: this.trackIndex,
-      fullPath: this.fullPath
-    }
-  }
-
-  setFromPodcastEpisode(libraryItem, serverAddress, slug, episode, meta) {
-    const contentFileExtension = Path.extname(episode.audioFile.metadata.filename)
-    const contentUrl = `/feed/${slug}/item/${episode.id}/media${contentFileExtension}`
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-
-    this.id = episode.id
-    this.title = episode.title
-    this.description = episode.description || ''
-    this.enclosure = {
-      url: `${contentUrl}`,
-      type: episode.audioTrack.mimeType,
-      size: episode.size
-    }
-    this.pubDate = episode.pubDate
-    this.link = meta.link
-    this.author = meta.author
-    this.explicit = mediaMetadata.explicit
-    this.duration = episode.duration
-    this.season = episode.season
-    this.episode = episode.episode
-    this.episodeType = episode.episodeType
-    this.libraryItemId = libraryItem.id
-    this.episodeId = episode.id
-    this.trackIndex = 0
-    this.fullPath = episode.audioFile.metadata.path
-  }
-
-  /**
-   *
-   * @param {import('../objects/LibraryItem')} libraryItem
-   * @param {string} serverAddress
-   * @param {string} slug
-   * @param {import('../objects/files/AudioTrack')} audioTrack
-   * @param {Object} meta
-   * @param {boolean} useChapterTitles
-   * @param {string} [pubDateOverride] Used for series & collections to ensure correct episode order
-   */
-  setFromAudiobookTrack(libraryItem, serverAddress, slug, audioTrack, meta, useChapterTitles, pubDateOverride = null) {
-    // Example: <pubDate>Fri, 04 Feb 2015 00:00:00 GMT</pubDate>
-    let timeOffset = isNaN(audioTrack.index) ? 0 : Number(audioTrack.index) * 1000 // Offset pubdate to ensure correct order
-    let episodeId = uuidv4()
-
-    // e.g. Track 1 will have a pub date before Track 2
-    const audiobookPubDate = pubDateOverride || date.format(new Date(libraryItem.addedAt + timeOffset), 'ddd, DD MMM YYYY HH:mm:ss [GMT]')
-
-    const contentFileExtension = Path.extname(audioTrack.metadata.filename)
-    const contentUrl = `/feed/${slug}/item/${episodeId}/media${contentFileExtension}`
-    const media = libraryItem.media
-    const mediaMetadata = media.metadata
-
-    let title = audioTrack.title
-    if (libraryItem.media.tracks.length == 1) {
-      // If audiobook is a single file, use book title instead of chapter/file title
-      title = libraryItem.media.metadata.title
-    } else {
-      if (useChapterTitles) {
-        // If audio track start and chapter start are within 1 seconds of eachother then use the chapter title
-        const matchingChapter = libraryItem.media.chapters.find((ch) => Math.abs(ch.start - audioTrack.startOffset) < 1)
-        if (matchingChapter?.title) title = matchingChapter.title
-      }
-    }
-
-    this.id = episodeId
-    this.title = title
-    this.description = mediaMetadata.description || ''
-    this.enclosure = {
-      url: `${contentUrl}`,
-      type: audioTrack.mimeType,
-      size: audioTrack.metadata.size
-    }
-    this.pubDate = audiobookPubDate
-    this.link = meta.link
-    this.author = meta.author
-    this.explicit = mediaMetadata.explicit
-    this.duration = audioTrack.duration
-    this.libraryItemId = libraryItem.id
-    this.episodeId = null
-    this.trackIndex = audioTrack.index
-    this.fullPath = audioTrack.metadata.path
-  }
-
-  getRSSData(hostPrefix) {
-    return {
-      title: this.title,
-      description: this.description || '',
-      url: `${hostPrefix}${this.link}`,
-      guid: `${hostPrefix}${this.enclosure.url}`,
-      author: this.author,
-      date: this.pubDate,
-      enclosure: {
-        url: `${hostPrefix}${this.enclosure.url}`,
-        type: this.enclosure.type,
-        size: this.enclosure.size
-      },
-      custom_elements: [
-        { 'itunes:author': this.author },
-        { 'itunes:duration': secondsToTimestamp(this.duration) },
-        { 'itunes:summary': this.description || '' },
-        {
-          'itunes:explicit': !!this.explicit
-        },
-        { 'itunes:episodeType': this.episodeType },
-        { 'itunes:season': this.season },
-        { 'itunes:episode': this.episode }
-      ]
-    }
-  }
-}
-module.exports = FeedEpisode
diff --git a/server/objects/FeedMeta.js b/server/objects/FeedMeta.js
deleted file mode 100644
index e439fe8f7..000000000
--- a/server/objects/FeedMeta.js
+++ /dev/null
@@ -1,100 +0,0 @@
-class FeedMeta {
-  constructor(meta) {
-    this.title = null
-    this.description = null
-    this.author = null
-    this.imageUrl = null
-    this.feedUrl = null
-    this.link = null
-    this.explicit = null
-    this.type = null
-    this.language = null
-    this.preventIndexing = null
-    this.ownerName = null
-    this.ownerEmail = null
-
-    if (meta) {
-      this.construct(meta)
-    }
-  }
-
-  construct(meta) {
-    this.title = meta.title
-    this.description = meta.description
-    this.author = meta.author
-    this.imageUrl = meta.imageUrl
-    this.feedUrl = meta.feedUrl
-    this.link = meta.link
-    this.explicit = meta.explicit
-    this.type = meta.type
-    this.language = meta.language
-    this.preventIndexing = meta.preventIndexing
-    this.ownerName = meta.ownerName
-    this.ownerEmail = meta.ownerEmail
-  }
-
-  toJSON() {
-    return {
-      title: this.title,
-      description: this.description,
-      author: this.author,
-      imageUrl: this.imageUrl,
-      feedUrl: this.feedUrl,
-      link: this.link,
-      explicit: this.explicit,
-      type: this.type,
-      language: this.language,
-      preventIndexing: this.preventIndexing,
-      ownerName: this.ownerName,
-      ownerEmail: this.ownerEmail
-    }
-  }
-
-  toJSONMinified() {
-    return {
-      title: this.title,
-      description: this.description,
-      preventIndexing: this.preventIndexing,
-      ownerName: this.ownerName,
-      ownerEmail: this.ownerEmail
-    }
-  }
-
-  getRSSData(hostPrefix) {
-    const blockTags = [{ 'itunes:block': 'yes' }, { 'googleplay:block': 'yes' }]
-    return {
-      title: this.title,
-      description: this.description || '',
-      generator: 'Audiobookshelf',
-      feed_url: `${hostPrefix}${this.feedUrl}`,
-      site_url: `${hostPrefix}${this.link}`,
-      image_url: `${hostPrefix}${this.imageUrl}`,
-      custom_namespaces: {
-        itunes: 'http://www.itunes.com/dtds/podcast-1.0.dtd',
-        psc: 'http://podlove.org/simple-chapters',
-        podcast: 'https://podcastindex.org/namespace/1.0',
-        googleplay: 'http://www.google.com/schemas/play-podcasts/1.0'
-      },
-      custom_elements: [
-        { language: this.language || 'en' },
-        { author: this.author || 'advplyr' },
-        { 'itunes:author': this.author || 'advplyr' },
-        { 'itunes:summary': this.description || '' },
-        { 'itunes:type': this.type },
-        {
-          'itunes:image': {
-            _attr: {
-              href: `${hostPrefix}${this.imageUrl}`
-            }
-          }
-        },
-        {
-          'itunes:owner': [{ 'itunes:name': this.ownerName || this.author || '' }, { 'itunes:email': this.ownerEmail || '' }]
-        },
-        { 'itunes:explicit': !!this.explicit },
-        ...(this.preventIndexing ? blockTags : [])
-      ]
-    }
-  }
-}
-module.exports = FeedMeta
diff --git a/server/objects/PodcastEpisodeDownload.js b/server/objects/PodcastEpisodeDownload.js
index 86a858016..eb9f059a3 100644
--- a/server/objects/PodcastEpisodeDownload.js
+++ b/server/objects/PodcastEpisodeDownload.js
@@ -53,6 +53,20 @@ class PodcastEpisodeDownload {
     if (globals.SupportedAudioTypes.includes(extname)) return extname
     return 'mp3'
   }
+  get enclosureType() {
+    const enclosureType = this.podcastEpisode?.enclosure?.type
+    return typeof enclosureType === 'string' ? enclosureType : null
+  }
+  /**
+   * RSS feed may have an episode with file extension of mp3 but the specified enclosure type is not mpeg.
+   * @see https://github.com/advplyr/audiobookshelf/issues/3711
+   *
+   * @returns {boolean}
+   */
+  get isMp3() {
+    if (this.enclosureType && !this.enclosureType.includes('mpeg')) return false
+    return this.fileExtension === 'mp3'
+  }
 
   get targetFilename() {
     const appendage = this.appendEpisodeId ? ` (${this.podcastEpisode.id})` : ''
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index a92796e8e..235d25cd5 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -10,6 +10,7 @@ const fs = require('../libs/fsExtra')
 const date = require('../libs/dateAndTime')
 
 const CacheManager = require('../managers/CacheManager')
+const RssFeedManager = require('../managers/RssFeedManager')
 
 const LibraryController = require('../controllers/LibraryController')
 const UserController = require('../controllers/UserController')
@@ -49,8 +50,6 @@ class ApiRouter {
     this.podcastManager = Server.podcastManager
     /** @type {import('../managers/AudioMetadataManager')} */
     this.audioMetadataManager = Server.audioMetadataManager
-    /** @type {import('../managers/RssFeedManager')} */
-    this.rssFeedManager = Server.rssFeedManager
     /** @type {import('../managers/CronManager')} */
     this.cronManager = Server.cronManager
     /** @type {import('../managers/EmailManager')} */
@@ -394,7 +393,7 @@ class ApiRouter {
     }
 
     // Close rss feed - remove from db and emit socket event
-    await this.rssFeedManager.closeFeedForEntityId(libraryItemId)
+    await RssFeedManager.closeFeedForEntityId(libraryItemId)
 
     // purge cover cache
     await CacheManager.purgeCoverCache(libraryItemId)
@@ -493,7 +492,7 @@ class ApiRouter {
    * @param {import('../models/Series')} series
    */
   async removeEmptySeries(series) {
-    await this.rssFeedManager.closeFeedForEntityId(series.id)
+    await RssFeedManager.closeFeedForEntityId(series.id)
     Logger.info(`[ApiRouter] Series "${series.name}" is now empty. Removing series`)
 
     // Remove series from library filter data
diff --git a/server/scanner/BookScanner.js b/server/scanner/BookScanner.js
index f0737dac0..74798dd63 100644
--- a/server/scanner/BookScanner.js
+++ b/server/scanner/BookScanner.js
@@ -6,21 +6,24 @@ const { getTitleIgnorePrefix, areEquivalent } = require('../utils/index')
 const parseNameString = require('../utils/parsers/parseNameString')
 const parseEbookMetadata = require('../utils/parsers/parseEbookMetadata')
 const globals = require('../utils/globals')
+const { readTextFile, filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
+
 const AudioFileScanner = require('./AudioFileScanner')
 const Database = require('../Database')
-const { readTextFile, filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
-const AudioFile = require('../objects/files/AudioFile')
-const CoverManager = require('../managers/CoverManager')
-const LibraryFile = require('../objects/files/LibraryFile')
 const SocketAuthority = require('../SocketAuthority')
-const fsExtra = require('../libs/fsExtra')
 const BookFinder = require('../finders/BookFinder')
+const fsExtra = require('../libs/fsExtra')
+const EBookFile = require('../objects/files/EBookFile')
+const AudioFile = require('../objects/files/AudioFile')
+const LibraryFile = require('../objects/files/LibraryFile')
+
+const RssFeedManager = require('../managers/RssFeedManager')
+const CoverManager = require('../managers/CoverManager')
 
 const LibraryScan = require('./LibraryScan')
 const OpfFileScanner = require('./OpfFileScanner')
 const NfoFileScanner = require('./NfoFileScanner')
 const AbsMetadataFileScanner = require('./AbsMetadataFileScanner')
-const EBookFile = require('../objects/files/EBookFile')
 
 /**
  * Metadata for books pulled from files
@@ -941,6 +944,9 @@ class BookScanner {
           id: bookSeriesToRemove
         }
       })
+      // Close any open feeds for series
+      await RssFeedManager.closeFeedsForEntityIds(bookSeriesToRemove)
+
       bookSeriesToRemove.forEach((seriesId) => {
         Database.removeSeriesFromFilterData(libraryId, seriesId)
         SocketAuthority.emitter('series_removed', { id: seriesId, libraryId })
diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index ac96c8d04..627e24b29 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -59,8 +59,8 @@ function extractPodcastMetadata(channel) {
 
   if (channel['description']) {
     const rawDescription = extractFirstArrayItem(channel, 'description') || ''
-    metadata.description = htmlSanitizer.sanitize(rawDescription)
-    metadata.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription)
+    metadata.description = htmlSanitizer.sanitize(rawDescription.trim())
+    metadata.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription.trim())
   }
 
   const arrayFields = ['title', 'language', 'itunes:explicit', 'itunes:author', 'pubDate', 'link', 'itunes:type']
@@ -103,8 +103,8 @@ function extractEpisodeData(item) {
   // Supposed to be the plaintext description but not always followed
   if (item['description']) {
     const rawDescription = extractFirstArrayItem(item, 'description') || ''
-    if (!episode.description) episode.description = htmlSanitizer.sanitize(rawDescription)
-    episode.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription)
+    if (!episode.description) episode.description = htmlSanitizer.sanitize(rawDescription.trim())
+    episode.descriptionPlain = htmlSanitizer.stripAllTags(rawDescription.trim())
   }
 
   if (item['pubDate']) {
diff --git a/server/utils/queries/libraryFilters.js b/server/utils/queries/libraryFilters.js
index bdddde759..57ca48ba8 100644
--- a/server/utils/queries/libraryFilters.js
+++ b/server/utils/queries/libraryFilters.js
@@ -54,7 +54,7 @@ module.exports = {
         items: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.mediaItemShare) {
             oldLibraryItem.mediaItemShare = li.mediaItemShare
@@ -91,7 +91,7 @@ module.exports = {
         libraryItems: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.size && !oldLibraryItem.media.size) {
             oldLibraryItem.media.size = li.size
@@ -109,7 +109,7 @@ module.exports = {
         libraryItems: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.size && !oldLibraryItem.media.size) {
             oldLibraryItem.media.size = li.size
@@ -138,7 +138,7 @@ module.exports = {
       libraryItems: libraryItems.map((li) => {
         const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
         if (li.rssFeed) {
-          oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+          oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
         if (li.series) {
           oldLibraryItem.media.metadata.series = li.series
@@ -168,7 +168,7 @@ module.exports = {
         items: libraryItems.map((li) => {
           const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
           if (li.rssFeed) {
-            oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+            oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
           }
           if (li.mediaItemShare) {
             oldLibraryItem.mediaItemShare = li.mediaItemShare
@@ -279,7 +279,7 @@ module.exports = {
       const oldSeries = s.toOldJSON()
 
       if (s.feeds?.length) {
-        oldSeries.rssFeed = Database.feedModel.getOldFeed(s.feeds[0]).toJSONMinified()
+        oldSeries.rssFeed = s.feeds[0].toOldJSONMinified()
       }
 
       // TODO: Sort books by sequence in query
@@ -375,7 +375,7 @@ module.exports = {
       libraryItems: libraryItems.map((li) => {
         const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
         if (li.rssFeed) {
-          oldLibraryItem.rssFeed = Database.feedModel.getOldFeed(li.rssFeed).toJSONMinified()
+          oldLibraryItem.rssFeed = li.rssFeed.toOldJSONMinified()
         }
         if (li.mediaItemShare) {
           oldLibraryItem.mediaItemShare = li.mediaItemShare
diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js
index b2784f5dd..ccce53045 100644
--- a/server/utils/queries/libraryItemsBookFilters.js
+++ b/server/utils/queries/libraryItemsBookFilters.js
@@ -615,8 +615,8 @@ module.exports = {
         }
       }
 
-      if (libraryItem.feeds?.length) {
-        libraryItem.rssFeed = libraryItem.feeds[0]
+      if (bookExpanded.libraryItem.feeds?.length) {
+        libraryItem.rssFeed = bookExpanded.libraryItem.feeds[0]
       }
 
       if (includeMediaItemShare) {
@@ -766,8 +766,8 @@ module.exports = {
           name: s.name,
           sequence: s.bookSeries[bookIndex].sequence
         }
-        if (libraryItem.feeds?.length) {
-          libraryItem.rssFeed = libraryItem.feeds[0]
+        if (s.bookSeries[bookIndex].book.libraryItem.feeds?.length) {
+          libraryItem.rssFeed = s.bookSeries[bookIndex].book.libraryItem.feeds[0]
         }
         libraryItem.media = book
         return libraryItem
@@ -900,8 +900,8 @@ module.exports = {
       delete book.libraryItem
       libraryItem.media = book
 
-      if (libraryItem.feeds?.length) {
-        libraryItem.rssFeed = libraryItem.feeds[0]
+      if (bookExpanded.libraryItem.feeds?.length) {
+        libraryItem.rssFeed = bookExpanded.libraryItem.feeds[0]
       }
 
       return libraryItem
diff --git a/server/utils/queries/libraryItemsPodcastFilters.js b/server/utils/queries/libraryItemsPodcastFilters.js
index 2f259efc0..c7c0914be 100644
--- a/server/utils/queries/libraryItemsPodcastFilters.js
+++ b/server/utils/queries/libraryItemsPodcastFilters.js
@@ -180,8 +180,8 @@ module.exports = {
 
       delete podcast.libraryItem
 
-      if (libraryItem.feeds?.length) {
-        libraryItem.rssFeed = libraryItem.feeds[0]
+      if (podcastExpanded.libraryItem.feeds?.length) {
+        libraryItem.rssFeed = podcastExpanded.libraryItem.feeds[0]
       }
       if (podcast.numEpisodesIncomplete) {
         libraryItem.numEpisodesIncomplete = podcast.numEpisodesIncomplete
diff --git a/server/utils/queries/seriesFilters.js b/server/utils/queries/seriesFilters.js
index c293f1dfb..2e0e23469 100644
--- a/server/utils/queries/seriesFilters.js
+++ b/server/utils/queries/seriesFilters.js
@@ -182,7 +182,7 @@ module.exports = {
       }
 
       if (s.feeds?.length) {
-        oldSeries.rssFeed = Database.feedModel.getOldFeed(s.feeds[0]).toJSONMinified()
+        oldSeries.rssFeed = s.feeds[0].toOldJSONMinified()
       }
 
       // TODO: Sort books by sequence in query
diff --git a/test/server/controllers/LibraryItemController.test.js b/test/server/controllers/LibraryItemController.test.js
index 3e7c58b25..3fcd1cf81 100644
--- a/test/server/controllers/LibraryItemController.test.js
+++ b/test/server/controllers/LibraryItemController.test.js
@@ -6,7 +6,6 @@ const Database = require('../../../server/Database')
 const ApiRouter = require('../../../server/routers/ApiRouter')
 const LibraryItemController = require('../../../server/controllers/LibraryItemController')
 const ApiCacheManager = require('../../../server/managers/ApiCacheManager')
-const RssFeedManager = require('../../../server/managers/RssFeedManager')
 const Logger = require('../../../server/Logger')
 
 describe('LibraryItemController', () => {
@@ -20,8 +19,7 @@ describe('LibraryItemController', () => {
     await Database.buildModels()
 
     apiRouter = new ApiRouter({
-      apiCacheManager: new ApiCacheManager(),
-      rssFeedManager: new RssFeedManager()
+      apiCacheManager: new ApiCacheManager()
     })
 
     sinon.stub(Logger, 'info')