Extract the creation of TsdbQuery objects into a QueryBuilder

The plus sign here will be a string concatination even though its inside the append func ;)