diff --git a/tiddl/core/metadata/track.py b/tiddl/core/metadata/track.py
index 049ea2c..b2179f2 100644
--- a/tiddl/core/metadata/track.py
+++ b/tiddl/core/metadata/track.py
@@ -150,7 +150,7 @@ def add_track_metadata(
         disc_number=str(track.volumeNumber),
         copyright=track.copyright,
         album_artist=album_artist,
-        artists=", ".join(sorted(a.name.strip() for a in track.artists)),
+        artists="; ".join(sorted(a.name.strip() for a in track.artists)),
         album_title=track.album.title,
         date=date,
         isrc=track.isrc,
diff --git a/tiddl/core/metadata/video.py b/tiddl/core/metadata/video.py
index 43e988e..d64e81b 100644
--- a/tiddl/core/metadata/video.py
+++ b/tiddl/core/metadata/video.py
@@ -9,7 +9,7 @@ def add_video_metadata(path: Path, video: Video):
     mutagen.update(
         {
             "title": video.title,
-            "artist": ";".join([artist.name.strip() for artist in video.artists]),
+            "artist": "; ".join([artist.name.strip() for artist in video.artists]),
         }
     )
 
diff --git a/tiddl/core/utils/format.py b/tiddl/core/utils/format.py
index 22e99c1..8b8cae0 100644
--- a/tiddl/core/utils/format.py
+++ b/tiddl/core/utils/format.py
@@ -35,7 +35,7 @@ class Explicit:
         if self.value is None:
             return ""
 
-        features = format_spec.split(",")
+        features = format_spec.split("; ")
 
         def get_base():
             for feature in features:
@@ -149,9 +149,9 @@ def generate_template_data(
             isrc=isrc,
             quality=quality,
             artist=item.artist.name if item.artist else "",
-            artists=", ".join(main_artists),
-            features=", ".join(featured_artists),
-            artists_with_features=", ".join(main_artists + featured_artists),
+            artists="; ".join(main_artists),
+            features="; ".join(featured_artists),
+            artists_with_features="; ".join(main_artists + featured_artists),
             explicit=Explicit(getattr(item, "explicit", None)),
             dolby=dolby,
         )