Added.
You can now choose these two new options. Its a little complex with an IIF because if call name is empty you want to use the regular name.