diff --git a/approot/tracks.xml b/approot/tracks.xml
index 44992ebb..2779b3bc 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -44,7 +44,10 @@
 		</div>
 		<div class="p-2 flex-fill text-truncate">
 			<div class="d-block text-truncate">${name}</div>
-			${<if-has-release>}${release class="text-decoration-none link-success text-truncate"}${</if-has-release>}
+			<div class="text-truncate">
+				${<if-has-artists>}${artists class="d-none d-sm-inline"}${</if-has-artists>}
+				${<if-has-release>}${release class="d-inline text-decoration-none link-success"}${</if-has-release>}
+			</div>
 		</div>
 		<div class="p-2 d-none d-sm-block text-muted">
 			${duration}
@@ -64,10 +67,6 @@
 	</div>
 </message>
 
-<message id="Lms.Explore.Tracks.template.entry-artist">
-	${artist class="text-decoration-none link-secondary"}
-</message>
-
 <message id="Lms.Explore.Tracks.template.track-info">
 	<div class="modal fade" tabindex="-1">
 		<div class="modal-dialog modal-dialog-scrollable">
diff --git a/src/libs/services/database/impl/Track.cpp b/src/libs/services/database/impl/Track.cpp
index a4be79f6..993acdc1 100644
--- a/src/libs/services/database/impl/Track.cpp
+++ b/src/libs/services/database/impl/Track.cpp
@@ -401,9 +401,8 @@ Track::getArtists(EnumSet<TrackArtistLinkType> linkTypes) const
 		oss << " AND t_a_l.type IN (";
 
 		bool first {true};
-		for (TrackArtistLinkType type : linkTypes)
+		for ([[maybe_unused]] TrackArtistLinkType type : linkTypes)
 		{
-			(void) type;
 			if (!first)
 				oss << ", ";
 			oss << "?";
@@ -430,7 +429,7 @@ Track::getArtistIds(EnumSet<TrackArtistLinkType> linkTypes) const
 
 	std::ostringstream oss;
 	oss <<
-		"SELECT a.id from artist a"
+		"SELECT DISTINCT a.id from artist a"
 		" INNER JOIN track_artist_link t_a_l ON a.id = t_a_l.artist_id"
 		" INNER JOIN track t ON t.id = t_a_l.track_id";
 
@@ -439,9 +438,8 @@ Track::getArtistIds(EnumSet<TrackArtistLinkType> linkTypes) const
 		oss << " AND t_a_l.type IN (";
 
 		bool first {true};
-		for (TrackArtistLinkType type : linkTypes)
+		for ([[maybe_unused]] TrackArtistLinkType type : linkTypes)
 		{
-			(void) type;
 			if (!first)
 				oss << ", ";
 			oss << "?";
@@ -450,14 +448,14 @@ Track::getArtistIds(EnumSet<TrackArtistLinkType> linkTypes) const
 		oss << ")";
 	}
 
-	Wt::Dbo::Query<ArtistId> query {session()->query<ArtistId>(oss.str())
-		.where("t.id = ?").bind(getId())};
-
+	auto query {session()->query<ArtistId>(oss.str())};
 	for (TrackArtistLinkType type : linkTypes)
 		query.bind(type);
 
-	Wt::Dbo::collection<ArtistId> res = query;
-	return std::vector<ArtistId>(std::begin(res), std::end(res));
+	query.where("t.id = ?").bind(getId());
+
+	auto res {query.resultList()};
+	return std::vector<ArtistId>(std::cbegin(res), std::cend(res));
 }
 
 std::vector<TrackArtistLink::pointer>
diff --git a/src/libs/services/database/test/Artist.cpp b/src/libs/services/database/test/Artist.cpp
index bad6e5e7..6b7868b0 100644
--- a/src/libs/services/database/test/Artist.cpp
+++ b/src/libs/services/database/test/Artist.cpp
@@ -91,6 +91,18 @@ TEST_F(DatabaseFixture, Artist_singleTrack)
 		EXPECT_EQ(track->getArtists({}).size(), 1);
 	}
 
+	{
+		auto transaction {session.createSharedTransaction()};
+
+		auto artists {track->getArtistIds({TrackArtistLinkType::Artist})};
+		ASSERT_EQ(artists.size(), 1);
+		EXPECT_EQ(artists.front(), artist.getId());
+
+		ASSERT_EQ(track->getArtistIds({TrackArtistLinkType::Artist}).size(), 1);
+		EXPECT_TRUE(track->getArtistIds({TrackArtistLinkType::ReleaseArtist}).empty());
+		EXPECT_EQ(track->getArtistIds({}).size(), 1);
+	}
+
 	{
 		auto transaction {session.createSharedTransaction()};
 		auto tracks {Track::find(session, Track::FindParameters{}.setName("MyTrackName").setArtistName("MyArtist"))};
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index 1cd3561f..e9839b40 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -377,22 +377,11 @@ Release::refreshView()
 
 		entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain);
 
-		const auto artists {track->getArtists({TrackArtistLinkType::Artist})};
+		const auto artists {track->getArtistIds({TrackArtistLinkType::Artist})};
 		if (variousArtists && !artists.empty())
 		{
 			entry->setCondition("if-has-artists", true);
-
-			Wt::WContainerWidget* artistsContainer {entry->bindNew<Wt::WContainerWidget>("artists")};
-			bool firstArtist {true};
-			for (const auto& artist : artists)
-			{
-				if (!firstArtist)
-					artistsContainer->addNew<Wt::WText>(" · ");
-				auto anchor {Utils::createArtistAnchor(artist)};
-				anchor->addStyleClass("link-success text-decoration-none"); // hack
-				artistsContainer->addWidget(std::move(anchor));
-				firstArtist = false;
-			}
+			entry->bindWidget("artists", Utils::createArtistContainer(artists));
 		}
 
 		auto trackNumber {track->getTrackNumber()};
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index 6da0f2f4..2be43477 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -31,6 +31,7 @@
 #include "services/database/Track.hpp"
 #include "services/database/TrackArtistLink.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 
 #include "common/Template.hpp"
@@ -160,6 +161,16 @@ namespace UserInterface::TrackListHelpers
 		const Release::pointer release {track->getRelease()};
 		const TrackId trackId {track->getId()};
 
+		const auto artists {track->getArtistIds({TrackArtistLinkType::Artist})};
+		LMS_LOG(UI, DEBUG) << "Found " << artists.size() << " artists!";
+		if (!artists.empty())
+		{
+			entry->setCondition("if-has-artists", true);
+			Wt::WContainerWidget* artistsContainer {entry->bindWidget("artists", Utils::createArtistContainer(artists))};
+			if (track->getRelease())
+				artistsContainer->addNew<Wt::WText>(" — ");
+		}
+
 		if (track->getRelease())
 		{
 			entry->setCondition("if-has-release", true);