Use dynamic content replacement wherever possible instead of dynamic value resolving