NowPlaying data source selection

Also some bugfixes