Expand scope of nested rendering check