Add grape and country cols to wines