Index: Slim/Control/Commands.pm
===================================================================
--- Slim/Control/Commands.pm	(revision 8579)
+++ Slim/Control/Commands.pm	(working copy)
@@ -2078,8 +2078,8 @@
 			}
 
 			# Turn 'track.*' into 'me.*'
-			if ($key =~ /^track(\.?.*)$/) {
-				$key = "me$1";
+			if ($key =~ /^(playlist)?track(\.?.*)$/) {
+				$key = "me$2";
 			}
 
 			$find{$key} = Slim::Utils::Text::ignoreCaseArticles($value);
@@ -2100,7 +2100,7 @@
 
 		return Slim::Schema->rs($fieldKey)->browse({ 'audio' => 1 });
 
-	} elsif ($find{'playlist.id'}) {
+	} elsif ($find{'playlist.id'} && !$find{'me.id'}) {
 
 		# Treat playlists specially - they are containers.
 		my $playlist = Slim::Schema->find('Playlist', $find{'playlist.id'});
@@ -2122,6 +2122,11 @@
 			delete $find{'contributor.id'};
 		}
 
+		if ($find{'playlist.id'}) {
+		
+			delete $find{'playlist.id'};
+		}
+
 		# Bug: 3629 - if we're sorting by album - be sure to include it in the join table.
 		if ($sort && $sort eq $albumSort) {
 			$joinMap{'album'} = 'album';