Index: Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix.html
===================================================================
--- Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix.html	(revision 23852)
+++ Slim/Plugin/MusicMagic/HTML/EN/plugins/MusicMagic/musicmagic_mix.html	(working copy)
@@ -7,7 +7,7 @@
 
 [% WRAPPER contentcontainer %]
 	[% FOREACH item = browse_items %]
-		[% PROCESS browsedbitems_list.html %]
+		[%- PROCESS browsedbitems_list.html item.includeAlbum = !album.id.defined item.includeArtist = includeArtist -%]
 	[% END %]
 [% END %]
 
Index: Slim/Plugin/MusicMagic/Plugin.pm
===================================================================
--- Slim/Plugin/MusicMagic/Plugin.pm	(revision 23852)
+++ Slim/Plugin/MusicMagic/Plugin.pm	(working copy)
@@ -863,7 +863,7 @@
 
 	my $itemnumber = 0;
 	$params->{'browse_items'} = [];
-	$params->{'levelName'} = "track";
+	$params->{'levelName'} = "playlisttrack";
 
 	$params->{'pwd_list'} .= ${Slim::Web::HTTP::filltemplatefile("plugins/MusicMagic/musicmagic_pwdlist.html", $params)};
 
@@ -871,7 +871,7 @@
 
 		push @{$params->{'browse_items'}}, {
 
-			'text'         => Slim::Utils::Strings::string('THIS_ENTIRE_PLAYLIST'),
+			'text'         => Slim::Utils::Strings::string('ALL_SONGS'),
 			'attributes'   => "&listRef=musicmagic_mix",
 			'odd'          => ($itemnumber + 1) % 2,
 			'webroot'      => $params->{'webroot'},