Proper URI encoding to avoid plus signs in strings