Much better time filtering and simplified. Fixed for repos.