CS fixes
Merge branch fix/query-params into master - fixes #97
Merge branch 'fix/overflow-query'