Improve external subs streaming support
Update