WP-3405 Added new markup fields