CDB-491 #fixes date filters