Moving query criterias into its own class

refactorings, before we can/should add new criterias to the HTTP endpoint for "sending"