More RESTful routes, fixed cancel / restore / delete flow