Index: Control/Queries.pm
===================================================================
--- Control/Queries.pm	(revision 10)
+++ Control/Queries.pm	(revision 16)
@@ -5016,13 +5016,15 @@
 	my $count     = shift; # loop index
 	my $index     = shift; # playlist index
 	my $track     = shift || return;
-	
+#	$log->debug('calling _songData with track:');
+#	$log->debug(Data::Dump::dump($track));	
 	my $songData  = _songData(
 		$request,
 		$track,
-		'AalKNcx',			# tags needed for our entities
+		'aAlKNcx',			# tags needed for our entities
 	);
-	
+#	$log->debug('songdata dump:');
+#	$log->debug(Data::Dump::dump($songData));
 	my $isRemote = $songData->{remote};
 	
 	$request->addResultLoop($loop, $count, 'trackType', $isRemote ? 'radio' : 'local');
@@ -5031,6 +5033,9 @@
 	my $title  = $text;
 	my $album  = $songData->{album};
 	my $artist = $songData->{artist};
+	my $composer = $songData->{composer};
+	my $conductor = $songData->{conductor};
+	my $band   = $songData->{band};
 	
 	# Bug 15779, include other role data
 	# XXX may want to include all contributor roles here?
@@ -5102,6 +5107,22 @@
 	} else {
 		$request->addResultLoop($loop, $count, 'artist', '');
 	}
+	if ( defined($composer) ) {
+		$request->addResultLoop($loop, $count, 'composer', $composer);
+	} else {
+		$request->addResultLoop($loop, $count, 'composer', '');
+	};
+	if ( defined($conductor) ) {
+		$request->addResultLoop($loop, $count, 'conductor', $conductor);
+	} else {
+		$request->addResultLoop($loop, $count, 'conductor', '');
+	};
+	if ( defined($band) ) {
+		$request->addResultLoop($loop, $count, 'band', $band);
+	} else {
+		$request->addResultLoop($loop, $count, 'band', '');
+	};
+
 	# deliver as one formatted multi-line string for NP playlist screen
 	$request->addResultLoop($loop, $count, 'text', $text);
 
@@ -5446,7 +5467,6 @@
 
 sub _songDataFromHash {
 	my ( $request, $res, $tags ) = @_;
-	
 	# define an ordered hash for our results
 	tie (my %returnHash, "Tie::IxHash");