Improve shuffle (always keep the currently playing entry first)
Bring back artist's top-hits in global version