Change URI to use ID instead of name