#661 Added date validation to right condition value