make tracking and comments display correctly again