Fix change_form peer-inside-peer blocks with extrahead and content (causes duplicate content)