Issue #23284:correctly handle itemsite_supply_itemsite_id