entity-resolver fixes