Index: Slim/DataStores/DBI/DataModel.pm
===================================================================
--- Slim/DataStores/DBI/DataModel.pm    (revision 5504)
+++ Slim/DataStores/DBI/DataModel.pm    (working copy)
@@ -395,10 +395,10 @@
 our %sortFieldMap = (
        'title' => ['tracks.titlesort'],
        'genre' => ['genres.namesort'],
-       'album' => ['albums.titlesort','albums.disc','tracks.multialbumsortkey'],
+       'album' => ['albums.titlesort','albums.disc'],
        'contributor' => ['contributors.namesort'],
        'artist' => ['contributors.namesort'],
-       'track' => ['tracks.multialbumsortkey', 'tracks.disc','tracks.tracknum','tracks.titlesort'],
+       'track' => ['tracks.disc','tracks.tracknum','tracks.titlesort'],
        'tracknum' => ['tracks.disc','tracks.tracknum','tracks.titlesort'],
        'year' => ['tracks.year'],
        'lastPlayed' => ['tracks.lastPlayed'],
Index: Slim/DataStores/DBI/Album.pm
===================================================================
--- Slim/DataStores/DBI/Album.pm        (revision 5504)
+++ Slim/DataStores/DBI/Album.pm        (working copy)
@@ -25,6 +25,6 @@
        # This has the same sort order as %DataModel::sortFieldMap{'album'}
        $class->add_constructor('hasArtwork' => 'artwork_path IS NOT NULL ORDER BY titlesort, disc');
 
-       $class->has_many(tracks => 'Slim::DataStores::DBI::Track', { order_by => 'multialbumsortkey'});
+       $class->has_many(tracks => 'Slim::DataStores::DBI::Track', { order_by => 'disc,tracknum,titlesort'});
        $class->has_many(contributors => ['Slim::DataStores::DBI::ContributorAlbum' => 'contributor'] => 'album');
 }