Fixes for artist and format order