issue #23165: use new buildClause in itemSite and get rid of the old version