Added logic for playlist and fix for youtube