Mail Merge Variables - Most Not Working Since 151/152

I recently migrated from a much older version of Thunderbird where I had been using the Mail Merge add on. In 151/152 most of the variable fields are no longer recognised. Below is the list provided by the developer. I can only get FirstName LastName and PrimaryEmail to merge correctly I troubleshot with Custom1 JobTitle and Nickname to no avail. I've emailed the developer. I suspect Thunderbird has changed the names of the fields in updating the Address Book. Has anyone got a current list of variables for Thunderbird since the Address Book has been rebuilt? Thanks, Greg

{{DisplayName}} {{FirstName}} {{LastName}} {{NickName}} {{NamePrefix}} {{NameSuffix}} {{AdditionalNames}} {{PrimaryEmail}} {{SecondEmail}} {{HomePhone}} {{WorkPhone}} {{CellularNumber}} {{FaxNumber}} {{PagerNumber}} {{HomeAddress}} {{HomeCity}} {{HomeState}} {{HomeZipCode}} {{HomeCountry}} {{WebPage2}} {{WorkAddress}} {{WorkCity}} {{WorkState}} {{WorkZipCode}} {{WorkCountry}} {{WebPage1}} {{JobTitle}} {{Department}} {{Company}} {{Custom1}} {{Custom2}} {{Custom3}} {{Custom4}} {{Notes}} {{BirthYear}} {{BirthMonth}} {{BirthDay}} {{AnniversaryYear}} {{AnniversaryMonth}} {{AnniversaryDay}}