Add xref-match-item, and use it