PICKUP_LENGTH attribution fix and train sort messages