#669 - fix remove icon appering a lot of times on the page when the dataset contains countries