Make time-filter work; correct issue on tomorrow