Add country and admin1_code to geoname2whoosh schema