Bug/182/datagrid state on updates



<!---
@huboard:{"order":180.0,"milestone_order":196,"custom_state":"ready"}
-->