Templater and form handler updates