issue #22534: Fix problems with itemsite model.