Fixing issue 1 : escaping URL chars in parameters