DRY code

Remove duplicate Query / QueryParams and just have the one thing.
Merge pull request #1 from alphagov/dry

DRY code