MBST-4754: Fixes to YouTube adapter