Fix url encode issue - RES - 1144

Fix reported issue for URL encode