Index: Plugins/MusicMagic/Plugin.pm
===================================================================
--- Plugins/MusicMagic/Plugin.pm	(revision 4623)
+++ Plugins/MusicMagic/Plugin.pm	(working copy)
@@ -966,7 +966,7 @@
 	if ($filter) {
 		$::d_musicmagic && msg("MusicMagic: filter $filter in use.\n");
 
-		$args{'filter'} = $filter;
+		$args{'filter'} =  Slim::Web::HTTP::escape($filter);
 	}
 
 	my $argString = join( '&', map { "$_=$args{$_}" } keys %args );
@@ -1007,7 +1007,7 @@
 
 	unless ($http) {
 		# NYI
-		$::d_musicmagic && msg("Musicmagic Error - Couldn't get mix: $mixArgs\&$argString");
+		$::d_musicmagic && msg("Musicmagic Error - Couldn't get mix: $mixArgs\&$argString\n");
 		return @mix;
 	}
 
@@ -1117,21 +1117,6 @@
 
 	$params->{'pwd_list'} .= ${Slim::Web::HTTP::filltemplatefile("plugins/MusicMagic/musicmagic_pwdlist.html", $params)};
 
-	if (scalar @$mix) {
-
-		$params->{'mix_list'} .= ${Slim::Web::HTTP::filltemplatefile("browsedb_list.html", {
-
-			'text'       => Slim::Utils::Strings::string('THIS_ENTIRE_PLAYLIST'),
-			'attributes' => "&listRef=musicmagic_mix",
-			'odd'        => ($itemnumber + 1) % 2,
-			'webroot'    => $params->{'webroot'},
-			'skinOverride' => $params->{'skinOverride'},
-			'player' => $params->{'player'},
-		})};
-
-		$itemnumber++;
-	}
-
 	for my $item (@$mix) {
 
 		my %list_form = %$params;