Urls with dots in the query string keys are not correctly parsed (resubmit)

Resubmitted as requested in #31