Improve entity-asset check