@kbenne @macumber The OA system loops are not currently part of the new search. Should it be? The depth first search can handling going down to the OA node and RA node even if the sink is supply outlet node. 

The OA system loop wasn't part of the original search in Loop either.