Additonal Fixes to download URLs

XML could contains carriage or line breaks as well.