diff --git a/ui/src/album/AlbumInfo.jsx b/ui/src/album/AlbumInfo.jsx
index 98495d97a..6ddfda96f 100644
--- a/ui/src/album/AlbumInfo.jsx
+++ b/ui/src/album/AlbumInfo.jsx
@@ -26,6 +26,9 @@ const useStyles = makeStyles({
   tableCell: {
     width: '17.5%',
   },
+  value: {
+    whiteSpace: 'pre-line',
+  },
 })
 
 const AlbumInfo = (props) => {
@@ -113,7 +116,9 @@ const AlbumInfo = (props) => {
                   })}
                   :
                 </TableCell>
-                <TableCell align="left">{data[key]}</TableCell>
+                <TableCell align="left" className={classes.value}>
+                  {data[key]}
+                </TableCell>
               </TableRow>
             )
           })}
diff --git a/ui/src/common/ArtistLinkField.jsx b/ui/src/common/ArtistLinkField.jsx
index caad009d3..56a01030d 100644
--- a/ui/src/common/ArtistLinkField.jsx
+++ b/ui/src/common/ArtistLinkField.jsx
@@ -22,7 +22,8 @@ const ALink = withWidth()((props) => {
       }}
       {...rest}
     >
-      {artist.name}
+      {artist.name}{' '}
+      {artist.subroles?.length > 0 ? `(${artist.subroles.join(', ')})` : ''}
     </Link>
   )
 })
@@ -89,19 +90,29 @@ export const ArtistLinkField = ({ record, className, limit, source }) => {
   }
 
   // Dedupe artists, only shows the first 3
-  const seen = new Set()
+  const seen = new Map()
   const dedupedArtists = []
   let limitedShow = false
 
   for (const artist of artists ?? []) {
     if (!seen.has(artist.id)) {
-      seen.add(artist.id)
-
       if (dedupedArtists.length < limit) {
-        dedupedArtists.push(artist)
+        seen.set(artist.id, dedupedArtists.length)
+        dedupedArtists.push({
+          ...artist,
+          subroles: artist.subRole ? [artist.subRole] : [],
+        })
       } else {
         limitedShow = true
-        break
+      }
+    } else {
+      const position = seen.get(artist.id)
+
+      if (position !== -1) {
+        const existing = dedupedArtists[position]
+        if (artist.subRole && !existing.subroles.includes(artist.subRole)) {
+          existing.subroles.push(artist.subRole)
+        }
       }
     }
   }
diff --git a/ui/src/common/SongInfo.jsx b/ui/src/common/SongInfo.jsx
index fd75a728d..bce0e750f 100644
--- a/ui/src/common/SongInfo.jsx
+++ b/ui/src/common/SongInfo.jsx
@@ -36,6 +36,9 @@ const useStyles = makeStyles({
   tableCell: {
     width: '17.5%',
   },
+  value: {
+    whiteSpace: 'pre-line',
+  },
 })
 
 export const SongInfo = (props) => {
@@ -111,27 +114,27 @@ export const SongInfo = (props) => {
 
   return (
     <TableContainer>
-      <Table aria-label="song details" size="small">
-        <TableBody>
-          {record.rawTags && (
-            <Tabs value={tab} onChange={(_, value) => setTab(value)}>
-              <Tab
-                label={translate(`resources.song.fields.mappedTags`)}
-                id="mapped-tags-tab"
-                aria-controls="mapped-tags-body"
-              />
-              <Tab
-                label={translate(`resources.song.fields.rawTags`)}
-                id="raw-tags-tab"
-                aria-controls="raw-tags-body"
-              />
-            </Tabs>
-          )}
-          <div
-            hidden={tab === 1}
-            id="mapped-tags-body"
-            aria-labelledby={record.rawTags ? 'mapped-tags-tab' : undefined}
-          >
+      {record.rawTags && (
+        <Tabs value={tab} onChange={(_, value) => setTab(value)}>
+          <Tab
+            label={translate(`resources.song.fields.mappedTags`)}
+            id="mapped-tags-tab"
+            aria-controls="mapped-tags-body"
+          />
+          <Tab
+            label={translate(`resources.song.fields.rawTags`)}
+            id="raw-tags-tab"
+            aria-controls="raw-tags-body"
+          />
+        </Tabs>
+      )}
+      <div
+        hidden={tab == 1}
+        id="mapped-tags-body"
+        aria-labelledby={record.rawTags ? 'mapped-tags-tab' : undefined}
+      >
+        <Table aria-label="song details" size="small">
+          <TableBody>
             {Object.keys(data).map((key) => {
               return (
                 <TableRow key={`${record.id}-${key}`}>
@@ -141,7 +144,9 @@ export const SongInfo = (props) => {
                     })}
                     :
                   </TableCell>
-                  <TableCell align="left">{data[key]}</TableCell>
+                  <TableCell align="left" className={classes.value}>
+                    {data[key]}
+                  </TableCell>
                 </TableRow>
               )
             })}
@@ -152,7 +157,7 @@ export const SongInfo = (props) => {
                   scope="row"
                   className={classes.tableCell}
                 ></TableCell>
-                <TableCell align="left">
+                <TableCell align="left" className={classes.value}>
                   <h4>{translate(`resources.song.fields.tags`)}</h4>
                 </TableCell>
               </TableRow>
@@ -162,16 +167,22 @@ export const SongInfo = (props) => {
                 <TableCell scope="row" className={classes.tableCell}>
                   {name}:
                 </TableCell>
-                <TableCell align="left">{values.join(' • ')}</TableCell>
+                <TableCell align="left" className={classes.value}>
+                  {values.join(' • ')}
+                </TableCell>
               </TableRow>
             ))}
-          </div>
-          {record.rawTags && (
-            <div
-              hidden={tab === 0}
-              id="raw-tags-body"
-              aria-labelledby="raw-tags-tab"
-            >
+          </TableBody>
+        </Table>
+      </div>
+      {record.rawTags && (
+        <div
+          hidden={tab === 0}
+          id="raw-tags-body"
+          aria-labelledby="raw-tags-tab"
+        >
+          <Table size="small" aria-label="song raw tags">
+            <TableBody>
               <TableRow key={`${record.id}-raw-path`}>
                 <TableCell scope="row" className={classes.tableCell}>
                   {translate(`resources.song.fields.path`)}:
@@ -183,13 +194,15 @@ export const SongInfo = (props) => {
                   <TableCell scope="row" className={classes.tableCell}>
                     {key}:
                   </TableCell>
-                  <TableCell align="left">{value.join(' • ')}</TableCell>
+                  <TableCell align="left" className={classes.value}>
+                    {value.join(' • ')}
+                  </TableCell>
                 </TableRow>
               ))}
-            </div>
-          )}
-        </TableBody>
-      </Table>
+            </TableBody>
+          </Table>
+        </div>
+      )}
     </TableContainer>
   )
 }