Fix some parsing issues

Old vcard.php code was still being used