#645: changed states and countries