diff --git a/web-src/src/components/ListAlbums.vue b/web-src/src/components/ListAlbums.vue
index addf9712..01a30586 100644
--- a/web-src/src/components/ListAlbums.vue
+++ b/web-src/src/components/ListAlbums.vue
@@ -9,7 +9,7 @@
     </div>
     <div v-else-if="album.isItem" class="media" @click="open_album(album.item)">
       <div v-if="is_visible_artwork" class="media-left fd-has-action">
-        <p class="image is-64x64 fd-has-shadow fd-has-action">
+        <div class="image is-64x64 fd-has-shadow fd-has-action">
           <figure>
             <img
               v-lazy="{
@@ -20,7 +20,7 @@
               :artist="album.item.artist"
             />
           </figure>
-        </p>
+        </div>
       </div>
       <div class="media-content fd-has-action is-clipped">
         <div style="margin-top: 0.7rem">
diff --git a/web-src/src/pages/PageComposers.vue b/web-src/src/pages/PageComposers.vue
index 41c478ad..d8fd2222 100644
--- a/web-src/src/pages/PageComposers.vue
+++ b/web-src/src/pages/PageComposers.vue
@@ -27,7 +27,7 @@ import { byName, GroupByList } from '@/lib/GroupByList'
 
 const dataObject = {
   load: function (to) {
-    return webapi.library_composers()
+    return webapi.library_composers('music')
   },
 
   set: function (vm, response) {
diff --git a/web-src/src/pages/PageGenres.vue b/web-src/src/pages/PageGenres.vue
index 9963233a..c1f0f37c 100644
--- a/web-src/src/pages/PageGenres.vue
+++ b/web-src/src/pages/PageGenres.vue
@@ -27,7 +27,7 @@ import { byName, GroupByList } from '@/lib/GroupByList'
 
 const dataObject = {
   load: function (to) {
-    return webapi.library_genres()
+    return webapi.library_genres('music')
   },
 
   set: function (vm, response) {
diff --git a/web-src/src/webapi/index.js b/web-src/src/webapi/index.js
index 554f09e7..51d1aee7 100644
--- a/web-src/src/webapi/index.js
+++ b/web-src/src/webapi/index.js
@@ -292,8 +292,10 @@ export default {
     })
   },
 
-  library_genres() {
-    return axios.get('./api/library/genres')
+  library_genres(media_kind = undefined) {
+    return axios.get('./api/library/genres', {
+      params: { media_kind: media_kind }
+    })
   },
 
   library_genre(genre) {
@@ -303,8 +305,7 @@ export default {
   library_genre_albums(genre) {
     const genreParams = {
       type: 'albums',
-      media_kind: 'music',
-      expression: 'genre is "' + genre + '"'
+      expression: `genre is "${genre}" and media_kind is music`
     }
     return axios.get('./api/search', {
       params: genreParams
@@ -314,8 +315,7 @@ export default {
   library_genre_tracks(genre) {
     const genreParams = {
       type: 'tracks',
-      media_kind: 'music',
-      expression: 'genre is "' + genre + '"'
+      expression: `genre is "${genre}" and media_kind is music`
     }
     return axios.get('./api/search', {
       params: genreParams
@@ -333,8 +333,10 @@ export default {
     })
   },
 
-  library_composers() {
-    return axios.get('./api/library/composers')
+  library_composers(media_kind = undefined) {
+    return axios.get('./api/library/composers', {
+      params: { media_kind: media_kind }
+    })
   },
 
   library_composer(composer) {
@@ -344,8 +346,7 @@ export default {
   library_composer_albums(composer) {
     const params = {
       type: 'albums',
-      media_kind: 'music',
-      expression: 'composer is "' + composer + '"'
+      expression: `composer is "${composer}" and media_kind is music`
     }
     return axios.get('./api/search', {
       params: params
@@ -355,8 +356,7 @@ export default {
   library_composer_tracks(composer) {
     const params = {
       type: 'tracks',
-      media_kind: 'music',
-      expression: 'composer is "' + composer + '"'
+      expression: `composer is "${composer}" and media_kind is music`
     }
     return axios.get('./api/search', {
       params: params