Bugfix for ambiguous xref_id in query causing xref pipeline to halt.