WP-2643 More content field changes