Form values preserved when re-rendering the form, added type for individual messages.