DOCS-1336 update with upsert: true plus some reorg