diff --git a/src/cg/cg0100.cpp b/src/cg/cg0100.cpp
index e790ad5bf..73caff17e 100755
--- a/src/cg/cg0100.cpp
+++ b/src/cg/cg0100.cpp
@@ -16,7 +16,7 @@ class TPianoconti_app : public TRelation_application
 
   bool user_create();
   bool user_destroy();
-  virtual TMask* get_mask(int mode) {return _msk;}
+  virtual TMask* _get_mask(int mode) {return _msk;}
   virtual bool changing_mask(int mode) {return FALSE;}
   virtual bool protected_record(TRectype &rec);
   virtual void init_query_mode(TMask& m);
diff --git a/src/cg/cg0200.cpp b/src/cg/cg0200.cpp
index ae8fed25e..b43f36a71 100755
--- a/src/cg/cg0200.cpp
+++ b/src/cg/cg0200.cpp
@@ -35,7 +35,7 @@ class TClifo_application : public TRelation_application
 protected:
   bool user_create();
   bool user_destroy();
-  virtual TMask* get_mask(int mode) { return _msk; }
+  virtual TMask* _get_mask(int mode) { return _msk; }
   virtual bool changing_mask(int mode) { return false; }
   virtual bool save_and_new() const { return _savenew; }
   virtual bool protected_record(TRectype &rec);
diff --git a/src/cg/cg0300.cpp b/src/cg/cg0300.cpp
index e55f28a80..a8ab299e0 100755
--- a/src/cg/cg0300.cpp
+++ b/src/cg/cg0300.cpp
@@ -11,7 +11,7 @@ class CG0300_application : public TRelation_application
 
   bool user_create();
   bool user_destroy();
-  virtual TMask* get_mask(int mode) {return _msk;}
+	virtual TMask* _get_mask(int mode) { return _msk; }
   virtual bool changing_mask(int mode) {return FALSE;}
   virtual TRelation* get_relation() const {return _rel;}
   virtual void init_query_mode(TMask& m);
diff --git a/src/cg/cg0500.cpp b/src/cg/cg0500.cpp
index d4708ccd5..18bc803f9 100755
--- a/src/cg/cg0500.cpp
+++ b/src/cg/cg0500.cpp
@@ -68,7 +68,7 @@ protected:
   virtual bool user_destroy();
 
   virtual TRelation*   get_relation() const { return _rel; }
-  virtual TMask*       get_mask(int mode)   { return _msk; }
+  virtual TMask*       _get_mask(int mode)   { return _msk; }
   virtual bool         changing_mask(int mode) {return false; }
   virtual bool         remove();
   
diff --git a/src/cg/cg0600.cpp b/src/cg/cg0600.cpp
index e68797761..423a8d4a9 100755
--- a/src/cg/cg0600.cpp
+++ b/src/cg/cg0600.cpp
@@ -140,13 +140,13 @@ bool CGTTable_application::user_create()
   {
     if (get_tabname() == "ESC")
     {
-      get_mask()->set_handler(F_DATAINI, dataini_handler);
-      get_mask()->set_handler(BUT_CHECK, checkbut_handler);
+      get_mask(MODE_QUERY)->set_handler(F_DATAINI, dataini_handler);
+      get_mask(MODE_QUERY)->set_handler(BUT_CHECK, checkbut_handler);
     }
     if (get_tabname() == TAB_NOTECLI)
-      get_mask()->set_handler(F_NOT_DESC, desnot_handler);
+      get_mask(MODE_QUERY)->set_handler(F_NOT_DESC, desnot_handler);
     if (get_tabname() == "BNP")
-      get_mask()->set_handler(F_IBAN, iban_handler);
+      get_mask(MODE_QUERY)->set_handler(F_IBAN, iban_handler);
 
   }  
   return ok;
@@ -211,11 +211,12 @@ int CGTTable_application::rewrite(const TMask& m)
 //stringa delle tabelle (per ora solo tabella %NOT)
 void CGTTable_application::fragment_string()
 {
-  TMask& mask = *get_mask();
+  TMask& mask = *get_mask(MODE_QUERY);
   TString stringone = mask.get(F_NOT_DESC);
   TRectype& rec = get_relation()->curr();
   TString4 fieldname;
   int tot_length = 0;
+
   stringone.replace('\n', (char)0xB6);
   for (int i = 0; i < 6; i++)
   {
@@ -229,10 +230,11 @@ void CGTTable_application::fragment_string()
 
 void CGTTable_application::glue_string()
 {
-  TMask& mask = *get_mask();
+  TMask& mask = *get_mask(MODE_QUERY);
   TString stringone;
   TRectype& rec = get_relation()->curr();
   TString4 fieldname;
+
   for (int i = 0; i < 6; i++)
   {
     fieldname.format("S%d", i);
diff --git a/src/cg/cg0700.cpp b/src/cg/cg0700.cpp
index 4612c3d68..2516e90fc 100755
--- a/src/cg/cg0700.cpp
+++ b/src/cg/cg0700.cpp
@@ -68,7 +68,7 @@ class TOccasionali_app : public TRelation_application
 
   bool user_create();
   bool user_destroy();
-  virtual TMask* get_mask(int mode) {return _msk;}
+  virtual TMask* _get_mask(int mode) {return _msk;}
   virtual bool changing_mask(int mode) {return FALSE;}
 
 public:
diff --git a/src/cg/cg2102.h b/src/cg/cg2102.h
index ba74f415c..29f4cbf92 100755
--- a/src/cg/cg2102.h
+++ b/src/cg/cg2102.h
@@ -304,7 +304,7 @@ protected:                              // TRelation_application
   virtual bool user_destroy();
   bool iva_mask(const TMask & m) const { return m.source_file() == "cg2100c.msk"; }
   virtual bool changing_mask(int mode);
-  virtual TMask* get_mask(int mode);
+  virtual TMask* _get_mask(int mode);
   virtual TRelation* get_relation() const { return _rel; }
   virtual void init_query_mode(TMask& m);
   virtual void init_insert_mode(TMask& m);
diff --git a/src/cg/cg4700.cpp b/src/cg/cg4700.cpp
index 2a38235cc..49f7f9f51 100755
--- a/src/cg/cg4700.cpp
+++ b/src/cg/cg4700.cpp
@@ -25,7 +25,7 @@ class GesAcc_app : public TRelation_application
     virtual bool       user_create();
     virtual bool       user_destroy();
     virtual TRelation* get_relation() const { return _rel; }
-    virtual TMask*     get_mask(int mode);
+    virtual TMask*     _get_mask(int mode) {	return _mask;	}
     virtual bool       changing_mask(int mode) {return FALSE; }
 };                    
 
@@ -126,11 +126,6 @@ bool GesAcc_app::msk_acconto(TMask_field& f, KEY k)
   return TRUE;
 }
 
-TMask* GesAcc_app::get_mask(int /* mode */)
-{
-  return _mask;
-}
-
 int cg4700(int argc, char* argv[])
 {
   GesAcc_app app;
diff --git a/src/cg/cg5200.cpp b/src/cg/cg5200.cpp
index 3f93a5168..cb19e29e0 100755
--- a/src/cg/cg5200.cpp
+++ b/src/cg/cg5200.cpp
@@ -120,7 +120,7 @@ protected:
   virtual bool user_create();
   virtual bool user_destroy();
   virtual TRelation*   get_relation() const { return _rel; }
-  virtual TMask*       get_mask(int mode)   { return _msk; }
+  virtual TMask*       _get_mask(int mode)   { return _msk; }
   virtual bool         changing_mask(int mode) {return false; }
   virtual int read(TMask& m);
   virtual void init_query_mode(TMask&);
diff --git a/src/cg/cg5300.cpp b/src/cg/cg5300.cpp
index 69d0a004a..157c82cb2 100755
--- a/src/cg/cg5300.cpp
+++ b/src/cg/cg5300.cpp
@@ -38,7 +38,7 @@ protected: // Relapp
   virtual bool         user_destroy();
   
   virtual TRelation*   get_relation() const    { return _rel;  }
-  virtual TMask*       get_mask(int mode)      { return _msk;  }
+  virtual TMask*       _get_mask(int mode)      { return _msk;  }
   virtual bool         changing_mask(int mode) { return false; }
 
   // file intertface
diff --git a/src/cg/cg6300.cpp b/src/cg/cg6300.cpp
index 0b2916a50..2cda8c632 100755
--- a/src/cg/cg6300.cpp
+++ b/src/cg/cg6300.cpp
@@ -84,7 +84,7 @@ bool Tabtra_application::user_create()
   Tab_application::user_create();
 
   open_files(LF_TABCOM, LF_TAB, 0);
-	_msk     = get_mask();
+	_msk     = get_mask(MODE_QUERY);
   _tabname = get_tabname();
 
   if (_tabname == "%TRA") 
diff --git a/src/cg/cg6500.cpp b/src/cg/cg6500.cpp
index 0b4d692d2..720ef723f 100755
--- a/src/cg/cg6500.cpp
+++ b/src/cg/cg6500.cpp
@@ -723,7 +723,7 @@ bool Tabinv_application::user_create()
 { 
   Tab_application::user_create();
 
-  _msk     = get_mask();
+  _msk     = get_mask(MODE_QUERY);
   _tabname = get_tabname(); 
   _ditta_orig = -1;
   if (_tabname == "%IND")