Removed the ' ' -> '+' handling (prefer %20)