Fixing URL Format issues