Added Support for both album and artist sorting