Fixes for time filtering