Updated with UTF-8 support on selected fields