Migrate query setup mechanisms from Cosmotool

fix multi-term queries

(from redmine: issue id 1109, created on 2018-08-04tgradl, closed on 2018-08-04)