Correcting merge of query builder work, re-adding te_data col
Merging 1c5aef3