many fixes to vcard logic