Date criteria improvement

please review