CAL-507 fix displaying location and description when they are empty