fixing datafilter + datagrid