issue #20071: Fix various problems with shipto editing.