FIX: support for underscores in URLs (when using S3 storage)