diff --git a/web-src/src/components/ListAlbums.vue b/web-src/src/components/ListAlbums.vue
index 2ca0c98c..97836ba6 100644
--- a/web-src/src/components/ListAlbums.vue
+++ b/web-src/src/components/ListAlbums.vue
@@ -1,6 +1,6 @@
 <template>
   <template v-for="album in albums" :key="album.itemId">
-    <div v-if="!album.isItem && !hide_group_title" class="mt-6 mb-5 py-2">
+    <div v-if="!album.isItem" class="mt-6 mb-5 py-2">
       <span
         :id="'index_' + album.index"
         class="tag is-info is-light is-small has-text-weight-bold"
@@ -79,7 +79,6 @@ export default {
   components: { CoverArtwork, ModalDialog, ModalDialogAlbum },
   props: {
     albums: { required: true, type: Object },
-    hide_group_title: Boolean,
     media_kind: { default: '', type: String }
   },
   emits: ['play-count-changed', 'podcast-deleted'],
diff --git a/web-src/src/components/ListArtists.vue b/web-src/src/components/ListArtists.vue
index 641d7143..4e157436 100644
--- a/web-src/src/components/ListArtists.vue
+++ b/web-src/src/components/ListArtists.vue
@@ -1,6 +1,6 @@
 <template>
   <template v-for="artist in artists" :key="artist.itemId">
-    <div v-if="!artist.isItem && !hide_group_title" class="mt-6 mb-5 py-2">
+    <div v-if="!artist.isItem" class="mt-6 mb-5 py-2">
       <div class="media-content is-clipped">
         <span
           :id="'index_' + artist.index"
@@ -40,8 +40,7 @@ export default {
   name: 'ListArtists',
   components: { ModalDialogArtist },
   props: {
-    artists: { required: true, type: Object },
-    hide_group_title: Boolean
+    artists: { required: true, type: Object }
   },
 
   data() {
diff --git a/web-src/src/components/ListComposers.vue b/web-src/src/components/ListComposers.vue
index 5d87ae7c..6042d99c 100644
--- a/web-src/src/components/ListComposers.vue
+++ b/web-src/src/components/ListComposers.vue
@@ -1,6 +1,6 @@
 <template>
   <template v-for="composer in composers" :key="composer.itemId">
-    <div v-if="!composer.isItem && !hide_group_title" class="mt-6 mb-5 py-2">
+    <div v-if="!composer.isItem" class="mt-6 mb-5 py-2">
       <div class="media-content is-clipped">
         <span
           :id="'index_' + composer.index"
@@ -42,7 +42,6 @@ export default {
   components: { ModalDialogComposer },
   props: {
     composers: { required: true, type: Object },
-    hide_group_title: Boolean,
     media_kind: { default: '', type: String }
   },
 
diff --git a/web-src/src/components/ListGenres.vue b/web-src/src/components/ListGenres.vue
index 30f0a2ac..e4800863 100644
--- a/web-src/src/components/ListGenres.vue
+++ b/web-src/src/components/ListGenres.vue
@@ -1,6 +1,6 @@
 <template>
   <template v-for="genre in genres" :key="genre.itemId">
-    <div v-if="!genre.isItem && !hide_group_title" class="mt-6 mb-5 py-2">
+    <div v-if="!genre.isItem" class="mt-6 mb-5 py-2">
       <div class="media-content is-clipped">
         <span
           :id="'index_' + genre.index"
@@ -42,7 +42,6 @@ export default {
   components: { ModalDialogGenre },
   props: {
     genres: { required: true, type: Object },
-    hide_group_title: Boolean,
     media_kind: { required: true, type: String }
   },
 
diff --git a/web-src/src/pages/PageArtist.vue b/web-src/src/pages/PageArtist.vue
index 4b372fc7..4b2663e3 100644
--- a/web-src/src/pages/PageArtist.vue
+++ b/web-src/src/pages/PageArtist.vue
@@ -59,7 +59,7 @@
             v-text="$t('page.artist.track-count', { count: track_count })"
           />
         </p>
-        <list-albums :albums="albums" :hide_group_title="true" />
+        <list-albums :albums="albums" />
         <modal-dialog-artist
           :show="show_details_modal"
           :artist="artist"
@@ -123,15 +123,12 @@ export default {
         {
           id: 1,
           name: this.$t('page.artist.sort.name'),
-          options: { index: { field: 'name_sort', type: String } }
+          options: { criteria: [{ field: 'name_sort', type: String }] }
         },
         {
           id: 2,
           name: this.$t('page.artist.sort.release-date'),
-          options: {
-            criteria: [{ field: 'date_released', type: Date }],
-            index: { field: 'date_released', type: Date }
-          }
+          options: { criteria: [{ field: 'date_released', type: Date }] }
         }
       ],
       show_details_modal: false
diff --git a/web-src/src/pages/PageComposerAlbums.vue b/web-src/src/pages/PageComposerAlbums.vue
index 8d1891c4..fdf7f0dc 100644
--- a/web-src/src/pages/PageComposerAlbums.vue
+++ b/web-src/src/pages/PageComposerAlbums.vue
@@ -34,7 +34,7 @@
             "
           />
         </p>
-        <list-albums :albums="albums" :hide_group_title="true" />
+        <list-albums :albums="albums" />
         <modal-dialog-composer
           :show="show_details_modal"
           :composer="composer"
diff --git a/web-src/src/pages/PageSearchLibrary.vue b/web-src/src/pages/PageSearchLibrary.vue
index a43656a9..d8fb27e1 100644
--- a/web-src/src/pages/PageSearchLibrary.vue
+++ b/web-src/src/pages/PageSearchLibrary.vue
@@ -83,7 +83,7 @@
         <p class="title is-4" v-text="$t('page.search.artists')" />
       </template>
       <template #content>
-        <list-artists :artists="artists" :hide_group_title="true" />
+        <list-artists :artists="artists" />
       </template>
       <template #footer>
         <nav v-if="show_all_button(artists)" class="level">
@@ -112,7 +112,7 @@
         <p class="title is-4" v-text="$t('page.search.albums')" />
       </template>
       <template #content>
-        <list-albums :albums="albums" :hide_group_title="true" />
+        <list-albums :albums="albums" />
       </template>
       <template #footer>
         <nav v-if="show_all_button(albums)" class="level">
diff --git a/web-src/src/pages/PageSearchSpotify.vue b/web-src/src/pages/PageSearchSpotify.vue
index 216dbce5..fa0e7f4f 100644
--- a/web-src/src/pages/PageSearchSpotify.vue
+++ b/web-src/src/pages/PageSearchSpotify.vue
@@ -440,10 +440,7 @@ export default {
     search() {
       this.reset()
       this.search_query = this.query.query?.trim()
-      if (
-        !this.search_query ||
-        this.search_query.startsWith('query:')
-      ) {
+      if (!this.search_query || this.search_query.startsWith('query:')) {
         this.search_query = ''
         this.$refs.search_field.focus()
         return