Adding previous matches to the subpath match
Removing dead code from the resource graph route
Further cleanups in the resource graph route