Extract the creation of TsdbQuery objects into a QueryBuilder

maybe revert from * to the actual list a we had before.