Fix preserving query_string

Supports opengovernment/product#46