Add the original externalId as well

This makes it possible to extract the value without decoding from the
database.