Added encoding of request uri