[DD-833] applied fixes re. new internal schemata