handle query time units better