Minor bugfix, add country support

Entity done (ALFA)

Signed-off-by: Roger Manich <roger.manich@gmail.com>