#1198 finalize date filter