diff --git a/src/components.js b/src/components.js
index fbf1f3d..f97bded 100644
--- a/src/components.js
+++ b/src/components.js
@@ -33,14 +33,14 @@ export function makeSongItem(s, idx, list, { noArtistLink = false, noAlbumLink =
   el.className = 'song-item' + (S.queue[S.qIdx]?.id === s.id ? ' playing' : '');
   el.dataset.songId = s.id;
   const cv = coverUrl(s.coverArt, 128);
-  const artistParts = (s.artist || '').split(/\s*(?:\/|•|,)\s*/).filter(Boolean);
+  const artistParts = Array.isArray(s.artists) && s.artists.length
+    ? s.artists
+    : s.artist ? [{ name: s.artist, id: s.artistId || '' }] : [];
   const artistHtml = artistParts.length
-    ? artistParts.map((name, i) => {
-        const aid = i === 0 ? (s.artistId || '') : '';
-        return noArtistLink
-          ? `<span style="color:var(--text2)">${esc(name)}</span>`
-          : `<span class="song-link" onclick="event.stopPropagation();s_goArtist(event,'${esc(name)}','${aid}')">${esc(name)}</span>`;
-      }).join('<span style="color:var(--text3)"> • </span>')
+    ? artistParts.map(a => noArtistLink
+        ? `<span style="color:var(--text2)">${esc(a.name)}</span>`
+        : `<span class="song-link" onclick="event.stopPropagation();s_goArtist(event,'${esc(a.name)}','${a.id||''}')">${esc(a.name)}</span>`
+      ).join('<span style="color:var(--text3)"> • </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>`