Fixed possible problem with URI detection im master playlist.
Prepare for refactoring.