Fixed time filtering bugs
Merge branch 'tweaks'