diff --git a/render/endpoint.go b/render/endpoint.go
index 6ccdb79d4..8a61d7bc6 100644
--- a/render/endpoint.go
+++ b/render/endpoint.go
@@ -31,10 +31,9 @@ func MapEndpoints(endpointToID endpointToIDFunc, topology string) Renderer {
 
 func (e mapEndpoints) Render(ctx context.Context, rpt report.Report) Nodes {
 	local := LocalNetworks(rpt)
-	endpoints := SelectEndpoint.Render(ctx, rpt)
 	ret := newJoinResults(TopologySelector(e.topology).Render(ctx, rpt).Nodes)
 
-	for _, n := range endpoints.Nodes {
+	for _, n := range rpt.Endpoint.Nodes {
 		// Nodes without a hostid are mapped to pseudo nodes, if
 		// possible.
 		if _, ok := n.Latest.Lookup(report.HostNodeID); !ok {
@@ -47,5 +46,5 @@ func (e mapEndpoints) Render(ctx context.Context, rpt report.Report) Nodes {
 			ret.addChild(n, id, e.topology)
 		}
 	}
-	return ret.result(endpoints)
+	return ret.result(rpt.Endpoint.Nodes)
 }
diff --git a/render/host.go b/render/host.go
index a5f4d2b61..bc209b567 100644
--- a/render/host.go
+++ b/render/host.go
@@ -47,7 +47,7 @@ func nodes2Hosts(nodes Nodes) Nodes {
 			}
 		}
 	}
-	return ret.result(nodes)
+	return ret.result(nodes.Nodes)
 }
 
 func endpoint2Host(endpoint report.Node) string {
diff --git a/render/pod.go b/render/pod.go
index 2b5beb9e2..1e2cca0cc 100644
--- a/render/pod.go
+++ b/render/pod.go
@@ -197,5 +197,5 @@ func (m Map2Parent) Render(ctx context.Context, rpt report.Report) Nodes {
 			ret.addChildAndChildren(n, id, Pseudo)
 		}
 	}
-	return ret.result(input)
+	return ret.result(input.Nodes)
 }
diff --git a/render/process.go b/render/process.go
index 96f55581b..2474fd8e3 100644
--- a/render/process.go
+++ b/render/process.go
@@ -105,5 +105,5 @@ func processes2Names(processes Nodes) Nodes {
 			ret.addChildAndChildren(n, name, processNameTopology)
 		}
 	}
-	return ret.result(processes)
+	return ret.result(processes.Nodes)
 }
diff --git a/render/render.go b/render/render.go
index 2ab6f8d25..4cf0b0ce7 100644
--- a/render/render.go
+++ b/render/render.go
@@ -127,7 +127,7 @@ func (m Map) Render(ctx context.Context, rpt report.Report) Nodes {
 	span.LogFields(otlog.Int("input.nodes", len(input.Nodes)),
 		otlog.Int("ouput.nodes", len(output.nodes)))
 
-	return output.result(input)
+	return output.result(input.Nodes)
 }
 
 // Condition is a predecate over the entire report that can evaluate to true or false.
@@ -227,8 +227,8 @@ func (ret *joinResults) passThrough(n report.Node) {
 
 // Rewrite Adjacency of nodes in ret mapped from original nodes in
 // input, and return the result.
-func (ret *joinResults) result(input Nodes) Nodes {
-	for _, n := range input.Nodes {
+func (ret *joinResults) result(input report.Nodes) Nodes {
+	for _, n := range input {
 		outID, ok := ret.mapped[n.ID]
 		if !ok {
 			continue