Fixing token revoking and change URI template quoting