Further changes to dynamic content functionality