Update to use new video feeds and fix club video errors