WIP: add query generation for watdiv queries

Matthäus Zlochrequested to merge
40-introduce-query-generation into master

Merge request reports