Fixed charset encoding bug, implemented Country entity logic