WIP: new query/index implementation
data, timestamp support