Fix for #1311

Logic of date filters had been mixed-up