location form: fix county selector, finish contact edit