Index: Slim/Buttons/TrackInfo.pm
===================================================================
--- Slim/Buttons/TrackInfo.pm	(revision 3957)
+++ Slim/Buttons/TrackInfo.pm	(working copy)
@@ -39,7 +39,7 @@
 				$string = 'NOW_PLAYING_FROM';
 			}
 			
-			my ($line2, @search) = _trackDataForCurrentItem($client, $curItem);
+			my ($line2, $termlist) = _trackDataForCurrentItem($client, $curItem);
 
 			if ($client->linesPerScreen() == 1) {
 				$line2 = $client->doubleString($string);
@@ -53,7 +53,7 @@
 				'overlay2' => $client->symbols('notesymbol'),
 			});
 
-			$client->execute(['playlist', 'loadalbum', @search]);
+			$client->execute(['playlist', 'loadtracks', $termlist]);
 			$client->execute(['playlist', 'jump', 0]);
 		},
 		
@@ -72,7 +72,7 @@
 
 			$string = 'ADDING_TO_PLAYLIST';
 
-			my ($line2, @search) = _trackDataForCurrentItem($client, $curItem);
+			my ($line2, $termlist) = _trackDataForCurrentItem($client, $curItem);
 
 			if ($client->linesPerScreen() == 1) {
 				$line2 = $client->doubleString($string);
@@ -86,7 +86,7 @@
 				'overlay2' => $client->symbols('notesymbol'),
 			});
 
-			$client->execute(["playlist", "addalbum", @search]);
+			$client->execute(["playlist", "addalbum", $termlist]);
 		},
 		
 		'up' => sub  {
@@ -225,10 +225,11 @@
 
 		$line2 = $track->album()->title();
 
-		push @search, $genre, $track->artist(), $line2;
+		push @search, "album=".$track->album()->id();
 	}
 
-	return ($line2, @search);
+	my $termlist = join '&',@search;
+	return ($line2, $termlist);
 }
 
 sub getFunctions {