Fix DateTime on null value
+ Fix Cidr on empty value