moved a little functionality from the OrderCreatorFilter to the PrepareForPickVisitor where it belongs