issue #23108: fix shipto search