added city / state / country for locations with similar names but different locations
changed an empty check to blank for better support