Bug fixes (symbols ' & " in the form again)