PIM-1597 Fixing mapping configuration for embedded docs