Added encoded urls again