Fix display of company/department of cards

Fixes #2662