Added Uri Escaping to BuildUri()