diff --git a/src/player.js b/src/player.js
index 27cb365..e7db00c 100644
--- a/src/player.js
+++ b/src/player.js
@@ -1227,15 +1227,13 @@ export function _restoreLastPlayed() {
     S.qIdx  = saved.qIdx  || 0;
     const s = S.queue[S.qIdx];
     if(!s) return;
-    document.getElementById('player-title').textContent = s.title || '—';
-    const artistParts = (s.artist || '').split(/\s*(?:\/|•|,)\s*/).filter(Boolean);
+    document.getElementById('player-title').textContent = dispTitle(s) || s.title || '—';
+    const artistParts = dispArtistParts(s, parseArtists);
     document.getElementById('player-artist-name').innerHTML = artistParts.length
-      ? artistParts.map((name, i) => {
-          const aid = i === 0 ? (s.artistId || '') : '';
-          return `<span style="cursor:pointer" onclick="s_goArtist(event,'${esc(name)}','${aid}')">${esc(name)}</span>`;
-        }).join('<span style="color:var(--text3)"> • </span>')
+      ? artistParts.map(a => `<span style="cursor:pointer" onclick="s_goArtist(event,'${esc(a.originalName||a.name)}','${a.id||''}')">${esc(a.name)}</span>`)
+               .join('<span style="color:var(--text3)"> • </span>')
       : '—';
-    document.getElementById('player-album-name').textContent = s.album || '';
+    document.getElementById('player-album-name').textContent = dispAlbum(s) || s.album || '';
     const art = document.getElementById('player-art');
     const cv = coverUrl(s.coverArt, 256);
     art.innerHTML = cv ? `<img src="${cv}" style="width:100%;height:100%;object-fit:cover">` : '<div class="no-art">♪</div>';
diff --git a/src/views.js b/src/views.js
index df384f1..8f87d83 100644
--- a/src/views.js
+++ b/src/views.js
@@ -6,7 +6,7 @@ import { playQueue, dlSongLocal, playPreview, toggleStar, parseArtists } from '.
 import { showCtxMenu, openEditPlModal, openDlModal, closeSidebar, switchNavMode } from './ui.js';
 import { closeNowPlaying, closeNpMenu } from './nowplaying.js';
 import { makeCard, makeAlbumCard, makeSongItem, makeGlobalTrackItem, mkSection } from './components.js';
-import { fetchRomajiIndex, dispArtistById, romajiLookup } from './api.js';
+import { fetchRomajiIndex, dispArtistById, dispAlbumName, romajiLookup } from './api.js';
 import { loadSpotifyImporter } from './spotify.js';
 import { loadSoundCloudImporter } from './soundcloud.js';
 
@@ -650,10 +650,10 @@ export async function loadItunesAlbumDetail(album) {
 export async function loadAlbumDetail(album) {
   document.getElementById('album-back-btn').onclick = () =>
     album._fromArtist ? navigate('artist-detail', album._fromArtist) : navigate('albums');
-  document.getElementById('album-detail-name').textContent = album.name;
+  document.getElementById('album-detail-name').textContent = dispAlbumName(album.name);
   const artistEl = document.getElementById('album-detail-artist');
   artistEl.innerHTML = parseArtists(album)
-    .map(a => `<span class="song-link" onclick="event.stopPropagation();s_goArtist(event,'${esc(a.originalName||a.name)}','${esc(a.id||'')}')">${esc(a.name)}</span>`)
+    .map(a => `<span class="song-link" onclick="event.stopPropagation();s_goArtist(event,'${esc(a.originalName||a.name)}','${esc(a.id||'')}')">${esc(dispArtistById(a.id, a.name))}</span>`)
     .join('<span style="color:var(--text3)"> • </span>') || '';
   const cw = document.getElementById('album-cover-wrap');
   const cv = coverUrl(album.coverArt, 512);