Support:

I'm OK with #1 and #2 is, as Steve says, an unavoidable side effect of adding more Ship Via's. But #2 is a problem because a lot of long-term Adagio users have Customers with a Ship To assigned a blank code which operates as a default Ship To location.