Integrate tighter with uri

[Drup]

The construction of the regular expression is, atm, hacky and incorrect. If uri were to expose a function to query safe chars and to build a regular expressions for uri, we could use it.