Add url encoding

bug 47010

patch by Dima

Change-Id: I5f0a51a9f4428cd3976ab7d0f55af66ea3fb0df7