Fixed URI escaping