Also improve searching for superfluous (XX) country suffixes.