refs #140; adds country data and adapts two forms due to enlarged country
selector
refs #303; fixed some small issues that occurred during the tests