query-params should not clobber query-string
Merge branch 'pr/154'
update changelog