More adjustments fro iOS VCard field mapping