Re-think time-query with ranges and spec it out