Do not output html if we do not specify that with macro_form
Update version