Fix overlapping relationships and misplaced arrow markers

Fix runs successfully with test data. DB still needs nodes data fixed.