Index: /Users/mh/Documents/workspace/SC7.0/HTML/Default/html/main.js
===================================================================
--- /Users/mh/Documents/workspace/SC7.0/HTML/Default/html/main.js	(revision 17149)
+++ /Users/mh/Documents/workspace/SC7.0/HTML/Default/html/main.js	(working copy)
@@ -927,12 +927,14 @@
 				var currentArtist, currentAlbum;
 				var currentTitle = '<a href="' + webroot + infoLink + '?player=' + player + '&amp;item=' + result.playlist_loop[0].id + '" target="browser">'
 					+
-					(result.current_title ? result.current_title : (
-						(result.playlist_loop[0].disc ? result.playlist_loop[0].disc + '-' : '')
-						+
-						(result.playlist_loop[0].tracknum ? result.playlist_loop[0].tracknum + ". " : '')
-						+
-						result.playlist_loop[0].title
+					(result.current_title ? result.current_title : 
+						(result.playlist_loop[0].remote_title ? result.playlist_loop[0].remote_title : (
+							(result.playlist_loop[0].disc ? result.playlist_loop[0].disc + '-' : '')
+							+
+							(result.playlist_loop[0].tracknum ? result.playlist_loop[0].tracknum + ". " : '')
+							+
+							result.playlist_loop[0].title
+						)
 					))
 					+
 					'</a>';
@@ -989,6 +991,9 @@
 
 					currentTitle += ' ' + strings['from'] + ' ' + currentAlbum;
 				}
+				else if (result.playlist_loop[0].remote_title && result.playlist_loop[0].title) {
+					Ext.get('ctrlCurrentAlbum').update(result.playlist_loop[0].title);
+				}
 				else {
 					Ext.get('ctrlCurrentAlbum').update('');
 				}
@@ -1080,7 +1085,7 @@
 		getUpdate : function(){
 			if (player) {
 				Utils.processPlayerCommand({
-					params: [ "status", "-", 1, "tags:gABbehldiqtyrSuoKL" ],
+					params: [ "status", "-", 1, "tags:gABbehldiqtyrSuoKLN" ],
 					failure: this.updateStatus,
 					success: this.updateStatus,
 					scope: this
Index: /Users/mh/Documents/workspace/SC7.0/Slim/Control/Queries.pm
===================================================================
--- /Users/mh/Documents/workspace/SC7.0/Slim/Control/Queries.pm	(revision 17149)
+++ /Users/mh/Documents/workspace/SC7.0/Slim/Control/Queries.pm	(working copy)
@@ -4519,6 +4519,7 @@
 		$returnHash{'title'} = $remoteMeta->{title} || $track->title;
 	}
 
+
 	my %tagMap = (
 		# Tag    Tag name             Token            Track method         Track field
 		#------------------------------------------------------------------------------
@@ -4587,6 +4588,7 @@
 		  'K' => [''],                                                                      # artwork URL, not in db
 		  'B' => [''],                                                                      # radio stream special buttons
 		  'L' => [''],                                                                      # special trackinfo link for i.e. Pandora
+		  'N' => [''],                                                                      # remote stream title
 
 	);
 	
@@ -4606,6 +4608,13 @@
 				$returnHash{buttons} = $meta;
 			}
 		}
+
+		# special case, remote stream name
+		elsif ($tag eq 'N' && $track->remote && !$track->secs && $remoteMeta->{title} && !$remoteMeta->{album} ) {
+			if ( my $meta = $track->title ) {
+				$returnHash{remote_title} = $meta;
+			}
+		}
 		
 		# special case, info_link for remote tracks
 		elsif ($tag eq 'L') {