=== Slim/Schema/ResultSet/Genre.pm
==================================================================
--- Slim/Schema/ResultSet/Genre.pm	(revision 31629)
+++ Slim/Schema/ResultSet/Genre.pm	(local)
@@ -91,6 +91,11 @@
 
 		$rs = $rs->search_related('contributorTracks');
 	}
+	
+	# Bug 6577, If sorting from the web based on artist, limit roles to Album Artist
+	if ( $sort && $sort =~ /contributor.namesort/ ) {
+		$find->{'contributor.role'} = 'ALBUMARTIST';
+	}
 
 	return $rs->search_related('contributor', {}, { 'order_by' => $sort || 'contributor.namesort' });
 }