City, state and country fields issue partially fixed.