Change XML and insert HD_GROUP_NO and HD_NO Fixes #241