Fix 35452 / 633 to make uri representation layer human readable

The internal representation remains encoded but the output display is being
transformed to make them human readable

https://bugzilla.wikimedia.org/show_bug.cgi?id=35452