Index: HTML/Default/browse_playlist_list.html
===================================================================
--- HTML/Default/browse_playlist_list.html	(revision 2423)
+++ HTML/Default/browse_playlist_list.html	(working copy)
@@ -2,9 +2,9 @@
   <td width="100%" [% IF odd %]class="odd"[% END %] [% IF not odd %]class="even"[% END %]>
       [% IF descend %] <a href="browse.html?dir=[% descend | uri %]&player=[% player | uri %]">[% title | html %]</a>  [% END %]
       [% IF not descend %]<a href="songinfo.html?[% IF item %]item=[% item %][% ELSE %]itempath=[% itempath | uri %][% END %]&player=[% player | uri %]">[% title | html %]</a>
-         [% IF album %] [% "FROM" | string %] [% END %] 
+         [% IF album && album != noAlbum %] [% "FROM" | string %] [% END %] 
          <i><a href="browsedb.html?hierarchy=track&level=0&album=[% album.id %]&player=[% player | uri %]" target="browser">[% album.title | html %]</a></i> 
-         [% IF artist %] [% "BY" | string %] [% END %] 
+         [% IF artist && artist != noArtist %] [% "BY" | string %] [% END %] 
          <a href="browsedb.html?hierarchy=album,track&level=0&artist=[% artist.id %]&player=[% player | uri %]" target="browser">[% artist.name | html %]</a>
       [% END %]
   </td>