Use is_null_date instead of normalize_date