Further refinements to describe.
Add the case where short_desc isn't present