Fix up the way that sub plugins are handled via the router