Update video fetch method, Bug fixes