Better detection of YT video id. Closes GH-142