Companies and countries are collected almost correctly. Some changes to the views