more changes in datafilter