Added escaping of vulnerable parts of the uri