Enhanced URI and Query String support.