Added proper URI encoding.