Updated countries whitelist
Added specific formatting rules at processing stage