Fixed serveral movie related issues