Fix - Incorrect youtube video URL

regex update and cleanup