Improve options for date and time ranges
Fix timestream path, e.g. include folder of hour