Add non-split first names support for any split countries
Wrap names in quotes
Remove quotes and comment markers from names