[BUGFIX] Edge case http query string building

Fixes #682
Merge pull request #683 from cedricziel/i682

[BUGFIX] Edge case http query string building