diff --git a/backend/novasonic-server.js b/backend/novasonic-server.js
index 7aa104e..b068b51 100644
--- a/backend/novasonic-server.js
+++ b/backend/novasonic-server.js
@@ -145,7 +145,7 @@ async function lookupItunesTrackMeta(artist, title) {
     const match = results.find(t =>
       norm(t.trackName) === norm(title) &&
       norm(t.artistName).split(' ')[0] === norm(artist).split(' ')[0]
-    ) || results[0];
+    );
     if (!match) return {};
     return {
       album:       match.collectionName || '',
diff --git a/src/components.js b/src/components.js
index abf0e5f..7396a1c 100644
--- a/src/components.js
+++ b/src/components.js
@@ -27,19 +27,24 @@ export function makeAlbumCard(a) {
 }
 
 // ─── SONG LIST ITEM (library) ───
-export function makeSongItem(s, idx, list) {
+export function makeSongItem(s, idx, list, { noArtistLink = false, noAlbumLink = false } = {}) {
   const el = document.createElement('div');
   if(s.starred && !s._starred) s._starred = true;
   el.className = 'song-item' + (S.queue[S.qIdx]?.id === s.id ? ' playing' : '');
   const cv = coverUrl(s.coverArt, 60);
+  const artistHtml = s.artistId||s.artist
+    ? (noArtistLink
+        ? `<span style="color:var(--text2)">${esc(s.artist||'')}</span>`
+        : `<span class="song-link" onclick="event.stopPropagation();s_goArtist(event,'${esc(s.artist||'')}','${s.artistId||''}')">${esc(s.artist||'')}</span>`)
+    : '';
+  const albumHtml = !noAlbumLink && (s.albumId||s.album)
+    ? `<span style="color:var(--text3)"> · </span><span class="song-link" onclick="event.stopPropagation();s_goAlbum(event,'${s.albumId||''}','${esc(s.album||'')}','${esc(s.artist||'')}','${s.artistId||''}')">${esc(s.album||'')}</span>`
+    : '';
   el.innerHTML = `<div class="song-num">${idx+1}</div>
     <div class="song-thumb">${cv ? `<img src="${cv}" loading="lazy" onerror="this.parentNode.innerHTML='<div class=\\'no-art\\'>♪</div>'">` : '<div class="no-art">♪</div>'}</div>
     <div class="song-info">
       <div class="song-title">${esc(s.title)}</div>
-      <div class="song-artist">
-        ${s.artistId||s.artist ? `<span class="song-link" onclick="event.stopPropagation();s_goArtist(event,'${esc(s.artist||'')}','${s.artistId||''}')">${esc(s.artist||'')}</span>` : ''}
-        ${s.albumId||s.album  ? `<span style="color:var(--text3)"> · </span><span class="song-link" onclick="event.stopPropagation();s_goAlbum(event,'${s.albumId||''}','${esc(s.album||'')}','${esc(s.artist||'')}','${s.artistId||''}')">${esc(s.album||'')}</span>` : ''}
-      </div>
+      <div class="song-artist">${artistHtml}${albumHtml}</div>
     </div>
     <div class="song-meta">
       <span class="song-dur">${formatDur(s.duration)}</span>
diff --git a/src/nowplaying.js b/src/nowplaying.js
index fc37bdc..300b59a 100644
--- a/src/nowplaying.js
+++ b/src/nowplaying.js
@@ -80,6 +80,7 @@ export function switchNpTab(tab) {
 // ─── LYRICS ───
 let _lyricsLines = [];
 let _lyricsSongId = null;
+let _lyricsLoadToken = 0;
 
 const LYRICS_LOOKAHEAD_MS = 200;
 
@@ -125,11 +126,14 @@ async function _loadNpLyrics(songId) {
   _lyricsLines = [];
   content.innerHTML = '<div style="text-align:center;padding:60px 0;color:rgba(255,255,255,.3);font-size:14px">Lade Lyrics…</div>';
 
+  const token = ++_lyricsLoadToken;
   const s = S.queue[S.qIdx];
   const { getLyricsBySongId } = await import('./api.js');
+  if(token !== _lyricsLoadToken) return;
 
   // 1. Try Navidrome structured lyrics
   const lyrics = await getLyricsBySongId(songId);
+  if(token !== _lyricsLoadToken) return;
   const track = lyrics[0];
   if(track?.synced && track.line?.length) {
     content.innerHTML = '';
@@ -149,6 +153,7 @@ async function _loadNpLyrics(songId) {
       ...(s?.album ? [new URLSearchParams({ artist_name: firstArtist, track_name: s?.title||'' })] : []),
     ];
     for(const p of attempts) {
+      if(token !== _lyricsLoadToken) return;
       const r = await fetch(`https://lrclib.net/api/get?${p}`, { signal: AbortSignal.timeout(6000) });
       if(r.ok) {
         const d = await r.json();
@@ -158,6 +163,7 @@ async function _loadNpLyrics(songId) {
       }
     }
   } catch {}
+  if(token !== _lyricsLoadToken) return;
 
   content.innerHTML = '';
   if(lrcText) {
@@ -194,7 +200,14 @@ export function updateLyricsHighlight(currentMs) {
     line.el.classList.toggle('active', i === activeIdx);
     line.el.classList.toggle('past', i < activeIdx);
   });
-  if(activeIdx >= 0) _lyricsLines[activeIdx].el.scrollIntoView({ behavior: 'smooth', block: 'center' });
+  if(activeIdx >= 0) {
+    const activeEl = _lyricsLines[activeIdx].el;
+    const container = document.getElementById('np-lyrics-view');
+    if(container) {
+      const target = activeEl.offsetTop - container.clientHeight / 2 + activeEl.clientHeight / 2;
+      container.scrollTo({ top: Math.max(0, target), behavior: 'smooth' });
+    }
+  }
 }
 
 export function onNpSongChange(songId) {
diff --git a/src/views.js b/src/views.js
index a4bf0df..e19ea53 100644
--- a/src/views.js
+++ b/src/views.js
@@ -440,7 +440,7 @@ export async function loadAlbumDetail(album) {
       toast(`⬇ ${songs.length} Titel Download gestartet`);
     };
     sl.innerHTML = '';
-    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs)));
+    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs, { noArtistLink: true, noAlbumLink: true })));
   } catch(e) { sl.innerHTML = `<p style="color:var(--danger)">${e.message}</p>`; }
 }
 
@@ -492,7 +492,7 @@ export async function loadPlaylistDetail(pl) {
       playQueue(shuffled, 0);
     };
     sl.innerHTML = '';
-    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs)));
+    songs.forEach((s,i) => sl.appendChild(makeSongItem(s, i, songs, { noArtistLink: true })));
   } catch(e) { sl.innerHTML = `<p style="color:var(--danger)">${e.message}</p>`; }
 }