Use set operations to simplify
Remove recursive object warning
Update template in number formatting
Better display name for dynamic countries