diff --git a/ba/boliircf.frm b/ba/boliircf.frm
index 18aa9747e..85a09f98a 100755
--- a/ba/boliircf.frm
+++ b/ba/boliircf.frm
@@ -1,7 +1,7 @@
 USE %IIR
 JOIN 6 INTO TIPOA=S0[1,1] CODANAGR=S0[2,6]
 JOIN 8 TO 6 INTO CODANAGR=CODANAGR
-JOIN 7 TO 9 INTO CODANAGR=CODANAGR
+JOIN 7 TO 6 INTO CODANAGR=CODANAGR
 JOIN 13 TO 8 ALIAS 113 INTO COM=COMNASC
 JOIN 13 TO 6 ALIAS 213 INTO COM=COMRF(COMRES)
 JOIN %UCC TO 213@ ALIAS 14 INTO CODTAB==UFFCONC
diff --git a/ba/deliircf.frm b/ba/deliircf.frm
index d173e6efe..3c9eb9fdc 100755
--- a/ba/deliircf.frm
+++ b/ba/deliircf.frm
@@ -2,12 +2,12 @@ USE %IIR
 JOIN 6 INTO TIPOA=S0[1,1] CODANAGR=S0[2,6]
 JOIN 8 TO 6 INTO CODANAGR=CODANAGR
 JOIN 7 TO 6 INTO CODANAGR=CODANAGR
-JOIN 13 TO 8 ALIAS 113 INTO COM=COMNASC
+JOIN 13 TO 8 ALIAS 113 INTO COM==COMNASC
 JOIN 13 TO 6 ALIAS 213 INTO COM=COMRF(COMRES)
 JOIN %BAN ALIAS 14 INTO CODTAB=S7
 JOIN %BAN ALIAS 24 INTO CODTAB=S7+S8
 JOIN 13 TO 24@ ALIAS 313 INTO COM=S5
-JOIN 13 TO 7 ALIAS 413 INTO COM=COMCOST
+JOIN 13 TO 7 ALIAS 413 INTO COM==COMCOST
 
 END
 DESCRIPTION
@@ -214,6 +214,12 @@ BEGIN
  GROUP  6
 END
 
+NUMERO -1
+BEGIN
+  KEY "Campo fittizio per azzerare il totalizzatore, non rimuovere"
+  MESSAGE RESET,9@
+END
+
 NUMERO 20
 BEGIN
  KEY "IRPEF 4007: PERIODO AA (1)"
diff --git a/ba/disgen.frm b/ba/disgen.frm
index 699ca28d6..16ff49c9f 100755
--- a/ba/disgen.frm
+++ b/ba/disgen.frm
@@ -3,7 +3,7 @@ JOIN 6 ALIAS 16 INTO TIPOA=S0[1,1] CODANAGR=S0[2,6]
 JOIN 8 TO 16@ ALIAS 18 INTO CODANAGR=CODANAGR
 JOIN 7 TO 16@ ALIAS 17 INTO CODANAGR=CODANAGR
 JOIN 13 TO 18@ ALIAS 113 INTO COM=COMNASC
-JOIN 13 TO 16@ ALIAS 213 INTO COM=COMRF(COMRES)
+JOIN 13 TO 16@ ALIAS 213 INTO COM==COMRF(COMRES)
 JOIN 13 TO 17@ ALIAS 413 INTO COM=COMCOST
 JOIN 6 ALIAS 26 INTO TIPOA=S1[1,1] CODANAGR=S1[2,6]
 JOIN 8 TO 16@ ALIAS 28 INTO CODANAGR=CODANAGR
@@ -174,6 +174,7 @@ STRINGA 13
 BEGIN
  KEY "RESIDENTE IN: VIA"
  PROMPT 81 13 ""
+ FIELD 16@->INDRF
  FIELD 16@->INDRES
 END
 
@@ -181,6 +182,7 @@ STRINGA 14
 BEGIN
  KEY "RESIDENTE IN: NUMERO CIVICO"
  PROMPT 127 13 ""
+ FIELD 16@->CIVRF
  FIELD 16@->CIVRES
 END
 
@@ -193,6 +195,7 @@ STRINGA 16
 BEGIN
  KEY "COGNOME"
  PROMPT 12 16 ""
+ GROUP 3
  FIELD 26@->RAGSOC[1,30]
 END
 
@@ -200,6 +203,7 @@ STRINGA 17
 BEGIN
  KEY "NOME"
  PROMPT 64 16 ""
+ GROUP 3
  FIELD 26@->RAGSOC[31,0]
 END
 
@@ -207,6 +211,7 @@ DATA 18
 BEGIN
  KEY "DATA DI NASCITA"
  PROMPT 105 16 ""
+ GROUP 3
  PICTURE "# #^ # #^^ # # #"
  FIELD 28@->DATANASC
  FORMAT "1444-"
@@ -216,6 +221,7 @@ STRINGA 19
 BEGIN
  KEY "SESSO (M o F)"
  PROMPT 131 16 ""
+ GROUP 3
  FIELD 28@->SESSO
 END
 
@@ -223,6 +229,7 @@ STRINGA 21
 BEGIN
  KEY "COMUNE (o Stato estero) DI NASCITA"
  PROMPT 12 18 ""
+ GROUP 3
  FIELD 313@->DENCOM
 END
 
@@ -230,6 +237,7 @@ STRINGA 22
 BEGIN
  KEY "PROV. DI NASCITA (sigla)"
  PROMPT 72 18 ""
+ GROUP 3
  FIELD 313@->PROVCOM
 END
 
@@ -237,6 +245,7 @@ STRINGA 23
 BEGIN
  KEY "CODICE FISCALE"
  PROMPT 81 18 ""
+ GROUP 3
  PICTURE "# # # # # # # # # # # # # # # #"
  FIELD 26@->COFI
 END
@@ -361,6 +370,7 @@ STRINGA 36
 BEGIN
  KEY "COD. CONTR. Coniuge (Esattoria Prov.)"
  PROMPT 6 55 ""
+ GROUP 3
  FIELD 26@->CODCONTR[1,2]
 END
 
@@ -368,6 +378,7 @@ STRINGA 42
 BEGIN
  KEY "COD. CONTR. Coniuge (Esattoria Com.)"
  PROMPT 14 55 ""
+ GROUP 3
  FIELD 26@->CODCONTR[3,5]
 END
 
@@ -375,6 +386,7 @@ STRINGA 43
 BEGIN
  KEY "COD. CONTR. Coniuge"
  PROMPT 30 55 ""
+ GROUP 3
  FIELD 26@->CODCONTR[6,13]
 END
 
@@ -382,6 +394,7 @@ STRINGA 44
 BEGIN
  KEY "COD. CONTR. Coniuge (C.c.)"
  PROMPT 50 55 ""
+ GROUP 3
  FIELD 26@->CODCONTR[14,15]
 END
 
diff --git a/ba/disiircf.frm b/ba/disiircf.frm
index 54a940b11..0f88fd03b 100755
--- a/ba/disiircf.frm
+++ b/ba/disiircf.frm
@@ -3,9 +3,9 @@ JOIN %UCC ALIAS 14 INTO CODTAB=S9
 JOIN 6 INTO TIPOA=S0[1,1] CODANAGR=S0[2,6]
 JOIN 8 TO 6 INTO CODANAGR=CODANAGR
 JOIN 7 TO 6 INTO CODANAGR=CODANAGR
-JOIN 13 TO 8 ALIAS 113 INTO COM=COMNASC
+JOIN 13 TO 8 ALIAS 113 INTO COM==COMNASC
 JOIN 13 TO 6 ALIAS 213 INTO COM=COMRF(COMRES)
-JOIN 13 TO 7 ALIAS 413 INTO COM=COMCOST
+JOIN 13 TO 7 ALIAS 413 INTO COM==COMCOST
 
 END
 DESCRIPTION
@@ -195,6 +195,12 @@ BEGIN
  GROUP  6
 END
 
+NUMERO -1
+BEGIN
+  KEY "Campo fittizio per azzerare il totalizzatore, non rimuovere"
+  MESSAGE RESET,9@
+END
+
 NUMERO 20
 BEGIN
  KEY "IRPEF 4007: PERIODO AA (1)"