JAL-2556 Resolved group update on colouring and escape