Get countrypicker autoselect to work right for profile editing page.
Also change value for US to United States of America