Improved time filtering