consolidate repeated node intersection logic
add test case which recreates MANTA-19 failure and fix for this issue