Support for playlists without channel number
Futher generalize and fix for prev. commit