Fix date range filtering, date_until_extension should be respected if set in the scheduling