diff --git a/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt b/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt
index 3bce98c69..fc9420618 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt
@@ -140,8 +140,10 @@ private class MusicGraphBuilderImpl : MusicGraph.Builder {
             vertex.genreVertices = vertex.genreVertices.distinct().toMutableList()
 
             playlistVertices.forEach {
-                val pointer = SongPointer.UID(entry.key)
-                it.pointerMap[pointer]?.forEach { index -> it.songVertices[index] = vertex }
+                val v363Pointer = SongPointer.UID(entry.key)
+                it.pointerMap[v363Pointer]?.forEach { index -> it.songVertices[index] = vertex }
+                val v400Pointer = SongPointer.UID(entry.value.preSong.v400Uid)
+                it.pointerMap[v400Pointer]?.forEach { index -> it.songVertices[index] = vertex }
             }
         }
 
diff --git a/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt b/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt
index c74db7940..e8958071e 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt
@@ -92,8 +92,10 @@ private class TagInterpreterImpl(private val interpretation: Interpretation) : T
                 update(song.tags.track)
                 update(song.tags.disc)
 
-                update(song.tags.artistNames.ifEmpty { listOf(null) })
-                update(song.tags.albumArtistNames.ifEmpty { listOf(null) })
+                val artistNames = interpretation.separators.split(song.tags.artistNames)
+                update(artistNames.ifEmpty { listOf(null) })
+                val albumArtistNames = interpretation.separators.split(song.tags.albumArtistNames)
+                update(albumArtistNames.ifEmpty { artistNames }.ifEmpty { listOf(null) })
             }
 
         return PreSong(