form templates fixes