fixed problems when no country is set and currencies are used