DOCS-2863 skip and _id plus some reorg