Conditional Formatting fix for new style structure