Fixing problem with populating state and country if not already present