PIM-2035 : fix order columns scenario