Rework xref-query-replace-in-results