more exportEntities fix