Fixed typos. A bug remain at UrlType node delete ...(817)

Change-Id: I769b07dd234e01a4434a047afa81958beeb1fe6e
Fixed bad previous merge

Change-Id: Id40806af842fe8e126d96711a3b6dd486d77ef4f