Datagrid command improvement