finished the scheme matching and uri_for updates