Playlist changed

Fixes Bug #1213734 and Bug #1213603
And some other changes, see commits