AI-644 Fixed regressions in CreateEntityHandler