unfortunately we need a uri-encode fix not available in 2.0.9