Refactor query params

Small opinionated refactor. The new version is just a tad cleaner.