utf-8 handling and empty first field mapping removed