Refactoring + DateTime filter