cleanup put all of the query into its own request class