entity re-import was improved
output messages were unified