diff --git a/src/pages/BandoFormsEdit/index.js b/src/pages/BandoFormsEdit/index.js
index c8b3bb2..05dbb73 100644
--- a/src/pages/BandoFormsEdit/index.js
+++ b/src/pages/BandoFormsEdit/index.js
@@ -23,7 +23,11 @@ import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 
 // api
 import FormsService from '../../service/forms-service';
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 import BandoService from '../../service/bando-service';
+
+// TODO temp data
+import { elementItems } from '../../tempData';
 import DocumentCategoryService from '../../service/document-category-service';
 
 // TODO temp data
@@ -114,6 +118,8 @@ const BandoFormsEdit = () => {
     const formCreateCallback = (data, shouldRedirect) => {
         if (data.status === 'SUCCESS') {
             const bandoId = getBandoId();
+            storeSet('unsetAsyncRequest');
+
             if (shouldRedirect) {
                 navigate(`/bandi/${bandoId}/forms/${data.data.id}/preview`);
                 return;
@@ -129,7 +135,6 @@ const BandoFormsEdit = () => {
                 });
             }
         }
-        storeSet('unsetAsyncRequest');
     }
 
     const errFormCreateCallback = (data) => {
diff --git a/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js b/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
index 2c21fb6..1620a06 100644
--- a/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
+++ b/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
@@ -15,7 +15,7 @@ import { Dialog } from 'primereact/dialog';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { Dropdown } from 'primereact/dropdown';
 import { classNames } from 'primereact/utils';
-import { InputSwitch } from 'primereact/inputswitch';
+//import { InputSwitch } from 'primereact/inputswitch';
 import { InputText } from 'primereact/inputtext';
 import { Toast } from 'primereact/toast';
 
@@ -180,14 +180,14 @@ const ArchiveDocument = ({
                             onChange={(e) => setValue('idClassificazione', e.value)}
                             options={categories}/>
                     </div>
-                    <div className="appForm__field">
+                    {/*<div className="appForm__field">
                         <label>
                             {__('Da firmare?', 'gepafin')}
                         </label>
                         <InputSwitch
                             checked={modalData.flagDaFirmare}
                             onChange={(e) => setValue('flagDaFirmare', e.value)}/>
-                    </div>
+                    </div>*/}
                     <div className="appForm__field">
                         <label className={classNames({ 'p-error': isEmpty(modalData.descrizione) })}>
                             {__('Descrizione', 'gepafin')}*