Additional co id parsing fix (CO-808)