Address ID was not correctly update in product collection (#1263)