Re #431 Improving contextual entities display.