Date filter fix