diff --git a/resources/cider-ui-tests/index.js b/resources/cider-ui-tests/index.js
index 765714bc..55120c4d 100644
--- a/resources/cider-ui-tests/index.js
+++ b/resources/cider-ui-tests/index.js
@@ -274,6 +274,7 @@ const app = new Vue({
                 "include[library-playlists]": "catalog,tracks",
                 "fields[playlists]": "curatorName,playlistType,name,artwork,url",
                 "include[library-songs]": "catalog,artists,albums",
+                "fields[catalog]": "artistUrl,albumUrl",
                 "fields[songs]": "artistUrl,albumUrl"} 
             try {
                 this.showingPlaylist = await app.mk.api.library.playlist(id,params)
@@ -394,9 +395,9 @@ const app = new Vue({
                     }
                     catch (_) { }
 
-                    if (albumId == "") {
-                        let albumQuery = await app.mk.api.search(item.attributes.albumName, { limit: 1, types: 'albums' })
+                    if (albumId == "") {            
                         try {
+                            let albumQuery = await app.mk.api.search(item.attributes.albumName +" "+ (item.attributes.artistName ?? ""), { limit: 1, types: 'albums' })
                             if (albumQuery.albums.data.length > 0) {
                                 albumId = albumQuery.albums.data[0].id;
                                 console.log(albumId)
@@ -446,6 +447,9 @@ const app = new Vue({
         },
         async getTypeFromID(kind, id, isLibrary = false, params = {}) {
             var a;
+            if ("kind" == "album" | "kind" == "albums") {
+              params["include"] = "tracks,artists,record-labels"
+            } 
             try {
                 a = await this.mkapi(kind.toString(), isLibrary, id.toString(), params);
             } catch (e) {
diff --git a/resources/cider-ui-tests/views/components/mediaitem-square-large.ejs b/resources/cider-ui-tests/views/components/mediaitem-square-large.ejs
index 716f241a..76f235ff 100644
--- a/resources/cider-ui-tests/views/components/mediaitem-square-large.ejs
+++ b/resources/cider-ui-tests/views/components/mediaitem-square-large.ejs
@@ -26,7 +26,7 @@
                 <div class="title text-overflow-elipsis" @click='app.routeView(item)'>
                     {{ item.attributes.name ?? '' }}
                 </div>
-                <div class="subtitle text-overflow-elipsis" v-if="item.attributes.artistName">
+                <div class="subtitle text-overflow-elipsis item-navigate" v-if="item.attributes.artistName" :style = "{'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : ''}" @click="if(item.attributes.artistName)app.searchAndNavigate(item,'artist')">
                     {{ item.attributes.artistName ?? '' }}
                 </div>
 
diff --git a/resources/cider-ui-tests/views/components/mediaitem-square-sp.ejs b/resources/cider-ui-tests/views/components/mediaitem-square-sp.ejs
index 01d5c45b..f070e9cd 100644
--- a/resources/cider-ui-tests/views/components/mediaitem-square-sp.ejs
+++ b/resources/cider-ui-tests/views/components/mediaitem-square-sp.ejs
@@ -27,8 +27,11 @@
                      :style="{'color' : (item.attributes.artwork.textColor1 != null) ? ('#'+item.attributes.artwork.textColor1) : `#eee`}" style="font-weight: 600">
                     {{ item.attributes.name }}
                 </div>
-                <div class="subtitle text-overflow-elipsis"
-                     :style="{'color' : (item.attributes.artwork.textColor1 != null) ? ('#'+item.attributes.artwork.textColor1) : `#eee`}" style="padding-left: 4px;padding-right: 4px; display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 2;white-space: normal;">
+                <div class="subtitle text-overflow-elipsis "
+                     :class="{'item-navigate': ((item.attributes.editorialNotes == null) && item.attributes.artistName)}"
+                     :style="{ 'z-index': ((item.attributes.editorialNotes == null) && item.attributes.artistName) ? '4' : '' ,'color' : (item.attributes.artwork.textColor1 != null) ? ('#'+item.attributes.artwork.textColor1) : `#eee`}" style="padding-left: 4px;padding-right: 4px; display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 2;white-space: normal;"
+                     @click="if((item.attributes.editorialNotes == null) && item.attributes.artistName)app.searchAndNavigate(item,'artist')"
+                     >
                     {{ (item.attributes.editorialNotes != null) ? item.attributes.editorialNotes.short
                     :(item.attributes.artistName ?? '') }}
                 </div>
diff --git a/resources/cider-ui-tests/views/pages/cider-playlist.ejs b/resources/cider-ui-tests/views/pages/cider-playlist.ejs
index 8ac26e0e..bd56ead7 100644
--- a/resources/cider-ui-tests/views/pages/cider-playlist.ejs
+++ b/resources/cider-ui-tests/views/pages/cider-playlist.ejs
@@ -21,7 +21,7 @@
                             <div class="playlist-name">{{data.attributes ? (data.attributes.name ??
                                 (data.attributes.title ?? '') ?? '') : ''}}
                             </div>
-                            <div class="playlist-artist" v-if="data.attributes && data.attributes.artistName">
+                            <div class="playlist-artist item-navigate" v-if="data.attributes && data.attributes.artistName" @click="if(data.attributes && data.attributes.artistName){ app.searchAndNavigate(data,'artist')}">
                                 {{data.attributes ? (data.attributes.artistName ?? '') :''}}
                             </div>
                             <div class="playlist-desc" v-if="data.attributes.editorialNotes">