Handle URLs with opaque set properly