Handle some edge cases in query-params
Merge pull request #7 from circleci/master

handle edge cases in query-params