Integrated TagHighlight to bundles.