Fix/gh 687 playlist handling

Fixes #687 and an other issue we can across with playlists not being identified.