Fixed highlighting issues in DiamondReader