Fix for date filters