Fixed state list and added county/province