WP-1778 add content form fixes