added not_empty_date option