Fix handling of nodes under remote subgraphs