Fixing S3 save and DiffBot external id save