Added [] to URI escaping