PIM-1597 Revert Group to Entity and fixes MongoDB product mapping