Change url to match the api in doc
Add changes missed in last commit