add filter for last generated data at not null and null