datagrid and datagrid+map templates upgrade