Fixed url problems with base64 encoding