CDB-662 #fixes date filters