diff --git a/jam-ui/src/components/affiliate/JKAffiliateLinks.js b/jam-ui/src/components/affiliate/JKAffiliateLinks.js
index 6255e3806..dbd95ec05 100644
--- a/jam-ui/src/components/affiliate/JKAffiliateLinks.js
+++ b/jam-ui/src/components/affiliate/JKAffiliateLinks.js
@@ -82,7 +82,7 @@ const JKAffiliateLinks = () => {
     return options;
   };
 
-  const homePageLink = useMemo(() => `${process.env.REACT_APP_CLIENT_BASE_URL}?affiliate=${affiliatePartnerId}`, [affiliatePartnerId]);
+  const homePageLink = useMemo(() => `${process.env.REACT_APP_BASE_URL}?affiliate=${affiliatePartnerId}`, [affiliatePartnerId]);
 
   const jamTrackLink = useMemo(() => jamTrack => {
     if (!jamTrack) {
@@ -95,7 +95,7 @@ const JKAffiliateLinks = () => {
     if (!artist) {
       return '';
     }
-    return `${process.env.REACT_APP_CLIENT_BASE_URL}/public/jamtracks/${encodeURIComponent(artist.original_artist_slug)}?affiliate=${affiliatePartnerId}`;
+    return `${process.env.REACT_APP_BASE_URL}/public/jamtracks/${encodeURIComponent(artist.original_artist_slug)}?affiliate=${affiliatePartnerId}`;
   }, [affiliatePartnerId]);
 
   //autocomplete related code
diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb
index d70e4e8c1..d454a5807 100644
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@@ -436,8 +436,8 @@ module JamRuby
 
 
         query = JamTrack.paginate(page: page, per_page: per_page)
-        query = query.select("original_artist, count(original_artist) AS song_count")
-        query = query.group("original_artist")
+        query = query.select("original_artist, original_artist_slug, count(original_artist) AS song_count")
+        query = query.group("original_artist, original_artist_slug")
         query = query.order('jam_tracks.original_artist')
 
         query = query.where("jam_tracks.status = ?", 'Production') unless user.admin