conform query building with rfc3986

ref #114