Use the correct escaping in uris

e handles ampersands and quotes and such in attributes
uri does encoding of unicode names to utf-8 % encoded