Bolding more consistent [MJ-519]