2 files changed, 13 insertions, 8 deletions
diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js b/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js
index f53e0f81..3d6e274b 100644
--- a/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js
+++ b/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js
@@ -14,7 +14,7 @@ export default {
       contribs
         .some(contrib =>
           contrib.thingProperty === 'artistContribs' &&
-          contrib.annotation !== 'featuring');
+         !contrib.isFeaturingCredit);
 
     const creditedAsContributor =
       contribs
@@ -22,9 +22,7 @@ export default {
 
     const annotatedContribs =
       contribs
-        .filter(contrib =>
-          contrib.annotation &&
-          contrib.annotation !== 'featuring');
+        .filter(contrib => !empty(contrib.annotationParts));
 
     const annotatedArtistContribs =
       annotatedContribs
@@ -117,10 +115,10 @@ export default {
     duration:
       query.track.duration,
 
-    contribAnnotations:
+    contribAnnotationParts:
       (query.displayedContributions
         ? query.displayedContributions
-            .map(contrib => contrib.annotation)
+            .flatMap(contrib => contrib.annotationParts)
         : null),
   }),
 
@@ -137,8 +135,8 @@ export default {
       firstReleaseTooltip: relations.firstReleaseTooltip,
 
       annotation:
-        (data.contribAnnotations
-          ? language.formatUnitList(data.contribAnnotations)
+        (data.contribAnnotationParts
+          ? language.formatUnitList(data.contribAnnotationParts)
           : html.blank()),
 
       content:
diff --git a/src/content/dependencies/linkContribution.js b/src/content/dependencies/linkContribution.js
index 46c07e5d..f9c27724 100644
--- a/src/content/dependencies/linkContribution.js
+++ b/src/content/dependencies/linkContribution.js
@@ -11,6 +11,7 @@ export default {
   }),
 
   data: (contribution) => ({
+    artistText: contribution.artistText,
     annotationParts: contribution.annotationParts,
     urls: contribution.artist.urls,
   }),
@@ -51,6 +52,12 @@ export default {
           chronologyKind: slots.chronologyKind,
         });
 
+        if (data.artistText) {
+          relations.artistLink.setSlots({
+            content: language.sanitize(data.artistText),
+          });
+        }
+
         workingOptions.artist =
           (html.isBlank(relations.tooltip) || slots.preventTooltip
             ? relations.artistLink