Final date filter bugfix