Company infobox key map improvement