some fixes for conditional formatting