Fix url encode-RES-1144