#12: refactored filename->externalId