Update to support the disabling of dynamic content