Fixing issue on Country view