Fixed bespoke URI handling to be compat with ipv6