--- Slim/Web/Pages.pm.old	2005-07-07 15:29:19.406250000 -0700
+++ Slim/Web/Pages.pm	2005-07-07 15:29:31.843750000 -0700
@@ -260,6 +260,7 @@ sub init {
 				my $item = shift;
 				my $itemname = shift;
 				my $descend = shift;
+				my $findCriteria = shift;
 
 				my ($track) = $item->tracks();
 $form->{'coverThumb'} = $item->artwork_path() || 1;
@@ -280,7 +281,7 @@ $form->{'size'}    = Slim::Utils::Prefs:
 
 					if ($artist) {
 						$form->{'artist'} = $artist;
-						$form->{'includeArtist'} = 1;
+						$form->{'includeArtist'} = defined $findCriteria->{'artist'} ? 0 : 1;
 					}
 				}
 				
@@ -1864,7 +1865,7 @@ sub browsedb {
 			$list_form{'itemobj'}	    = $item;
 
 			# This is calling into the %fieldInfo hash
-			&{$levelInfo->{'listItem'}}($ds, \%list_form, $item, $itemname, $descend);
+			&{$levelInfo->{'listItem'}}($ds, \%list_form, $item, $itemname, $descend, \%findCriteria);
 
 			my $anchor = substr($itemsort, 0, 1);
 
--- HTML/Default/browsedb_list.html.old	2005-07-07 15:33:06.171875000 -0700
+++ HTML/Default/browsedb_list.html	2005-07-07 15:33:21.531250000 -0700
@@ -9,7 +9,7 @@
 	<a href="[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
 
 	<!-- Include the artist for the album view -->
-	[% IF level == 1 && includeArtist && artist %]
+	[% IF includeArtist && artist %]
 
 		[% "BY" | string %]
 		<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]" target="browser">[% artist.name | html %]</a></i>
--- HTML/Fishbone/browsedb_list.html.old	2005-07-07 15:32:37.156250000 -0700
+++ HTML/Fishbone/browsedb_list.html	2005-07-07 15:22:24.500000000 -0700
@@ -9,7 +9,7 @@
 		[% IF descend %]<a href="[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% player | uri %]">[% text | html %][% IF showYear && year %] ([% year %])[% END %]</a>
 
 		<!-- Include the artist for the album view -->
-		[% IF level == 1 && includeArtist && artist %]
+		[% IF includeArtist && artist %]
 		 
 			[% "BY" | string %]
 			<a href="[% webroot %]browsedb.html?hierarchy=artist,album,track&level=1&artist=[% artist.id %]&player=[% player | uri %]">[% artist.name | html %]</a></i>