Improved encoding support for browsing and adding.