Fixed bugs with all updates for local pre-existing data