Another pass at improving URI: support percent encoded URI