More refactoring to correct cancel routing for the machine service views.