allow for templated query strings
raise on remaining {stuff} in expanded URIs
add test for templated query string escaping