Query now returns all relevant nodes for both sources and targets.