added new form templates. added CSV query object