Index: Slim/Schema/ResultSet/Base.pm
===================================================================
--- Slim/Schema/ResultSet/Base.pm	(revision 8922)
+++ Slim/Schema/ResultSet/Base.pm	(working copy)
@@ -197,8 +197,8 @@
 
 			# XXX - Don't pass $sortForLevel to descend* right
 			# now, as they can't handle it yet.
-			#$rs = $rs->$method($find, $condForLevel, $sortForLevel);
-			$rs = $rs->$method($find, $condForLevel, undef);
+			$rs = $rs->$method($find, $condForLevel, $sortForLevel);
+			#$rs = $rs->$method($find, $condForLevel, undef);
 		}
 	}
 
Index: Slim/Schema/ResultSet/Contributor.pm
===================================================================
--- Slim/Schema/ResultSet/Contributor.pm	(revision 8922)
+++ Slim/Schema/ResultSet/Contributor.pm	(working copy)
@@ -104,8 +104,13 @@
 
 	# Create a clean resultset
 	my $rs     = $self->result_source->resultset;
-	my $attr   = {
-		'order_by' => "concat('0', album.titlesort), album.disc",
+
+	if (!$sort) {
+		$sort = "concat('0', album.titlesort), album.disc";
+	}
+
+	my $attr = {
+		'order_by' => $sort,
 	};
 
 	if (my $roles = Slim::Schema->artistOnlyRoles($find->{'contributor.role'})) {