Rework short title display logic