Minor bug fixes

Minor bug fixes. Used country json for showcasing.