Add URI cleaner with non-ASCII output #1491