MB-8573: Escape special characters in url

Change-Id: Ia6037aef6e0785b5807d012d9cf7dd2c86810975