Issue #22472:change _item setQuery to addExtraClause