Restore UTF-8 uri encoding. Fix issue #149