DEVELOPER-264 Improve download URL generator