(refac) add countries and whitespace for countries found within common words