add support for name in country