Fix url encoding issue where sign '+' was not urlencoded