Shipment's waypoint text

[Wan]

I doubt many of you have this problem but I have a handful of character so I'm constantly having this issue. The issue is that unless you memorize where each faction's shipments spawn or you keep track of the order they spawn / the order you purchase them, then you cannot tell the difference when looking at shipment's waypoints, which is very annoying when you've walked the whole map or swam to the barge to realise you're on the wrong fucking character to collect the shipment. I suggest the character name shows above the waypoint, so it would look somewhat like this:

Al Capone's

Shipment

210 Metres

I know some of you won't relate but imagine potentially seven plus shipments on your screen and you're trying to collect them within the 600 seconds before you can order again and you cannot use a car as the car will despawn when you switch character, it sucks.