diff --git a/Slim/Control/Queries.pm b/Slim/Control/Queries.pm
index ed78b9b43b..8c1e59b8a2 100644
--- a/Slim/Control/Queries.pm
+++ b/Slim/Control/Queries.pm
@@ -5831,7 +5831,7 @@ sub _getTagDataForTracks {
 
 	# Normalize any search parameters
 	my $search = $args->{search};
-	if ( $search && specified($search) ) {
+	if ( $search && specified($search) && !$args->{trackId} ) {
 		if ( $search =~ s/^sql=// ) {
 			# Raw SQL search query
 			$search =~ s/;//g; # strip out any attempt at combining SQL statements
diff --git a/Slim/Menu/BrowseLibrary.pm b/Slim/Menu/BrowseLibrary.pm
index 8dbce938c9..5fd54264b5 100644
--- a/Slim/Menu/BrowseLibrary.pm
+++ b/Slim/Menu/BrowseLibrary.pm
@@ -1832,7 +1832,9 @@ sub _tracks {
 			my $items   = $results->{'titles_loop'};
 			$remote_library ||= $args->{'remote_library'};
 
+			my $trackIds;
 			foreach (@$items) {
+				$trackIds .= $_->{'id'} . ',';
 				# Map a few items that get different tags to those expected for TitleFormatter
 				# Currently missing composer, conductor, band because of additional cost of 'A' tag query
 				$_->{'ct'}            = $_->{'type'};
@@ -1947,6 +1949,7 @@ sub _tracks {
 					sort       => 'albumtrack',
 					menuStyle  => 'menuStyle:allSongs',
 					search     => 'sql=' . $sql,
+					track_id   => $trackIds,
 				);
 
 				my %allSongsActions = (