Use proper URI encoding