fixed #12: split out countrypc conversion and database upload