SM-13565 heading/table fixes