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