DRY code

Remove duplicate Query / QueryParams and just have the one thing.