Fix for #1311

Logic of date filters had been mixed-up
Maybe fix the values here?

They don't make much sense.