Bug/182/datagrid state on updates