Adding missing world_id index, index for z coords
Correcting merge of query builder work, re-adding te_data col