Allow for single company counts on rollovers

Also rationalise how the rollover text is generated