added time query option