Handle ugly url targets
Merge pull request #1653 from ScotterC/uri-addressable

URI adapter should use Addressable