PIM-2266: Clean datagrid context
PIM-2266: Fix typo