diff --git a/cg/cg0100.cpp b/cg/cg0100.cpp
index b20e705c8..68dc301c7 100755
--- a/cg/cg0100.cpp
+++ b/cg/cg0100.cpp
@@ -144,9 +144,9 @@ bool CG0100_application::protected_record(TRectype &rec)
 void CG0100_application::init_query_mode(TMask& m)
 
 {
-  m.show(-1); //m.send_key(K_SHIFT + K_CTRL + 's', -1);
-  m.show(-2); //m.send_key(K_SHIFT + K_CTRL + 's', -2);
-  m.show(-3); //m.send_key(K_SHIFT + K_CTRL + 's', -3);
+  m.show(-1);
+  m.show(-2);
+  m.show(-3);
 }
 
 HIDDEN bool tmcf_handler(TMask_field& f, KEY key)
@@ -174,12 +174,12 @@ void CG0100_application::init_insert_mode(TMask& m)
   bool ivd_enable = TRUE;
 
   if (conto == 0 && sottoc == 0)
-    m.show(-1, FALSE); // send_key(K_SHIFT + K_CTRL + 'h', -1);
+    m.show(-1, FALSE);
   else
     if (sottoc == 0)
-      m.show(-2, FALSE); //m.send_key(K_SHIFT + K_CTRL + 'h', -2);
+      m.show(-2, FALSE);
     else
-      m.show(-3, FALSE); //m.send_key(K_SHIFT + K_CTRL + 'h', -3);
+      m.show(-3, FALSE);
 
   TLocalisamfile& pconti = _rel->lfile();
   TString s(15), s2(1), s3(8), s4(2);
@@ -299,14 +299,15 @@ HIDDEN bool conto_handler(TMask_field& f, KEY key)
 HIDDEN bool sottoc_handler(TMask_field& f, KEY key)
 {
   if (key == K_TAB)
-  {
-    const int gruppo = f.mask().get_int(FLD_CM1_GRUPPO);
+  {                     
+    TMask& m = f.mask();
+    const int gruppo = m.get_int(FLD_CM1_GRUPPO);
     if (gruppo == 0) return TRUE;
-    const int conto = f.mask().get_int(FLD_CM1_CONTO);
-    const long sottoconto = f.mask().get_long(FLD_CM1_SOTTOCONTO);
+    const int conto = m.get_int(FLD_CM1_CONTO);
+    const long sottoconto = m.get_long(FLD_CM1_SOTTOCONTO);
     if (sottoconto != 0 && conto == 0) 
-      return f.mask().field(FLD_CM1_CONTO).error_box("Manca il conto");
-    return f.mask().stop_run(K_AUTO_ENTER);
+      return m.field(FLD_CM1_CONTO).error_box("Manca il conto");
+    return m.stop_run(K_AUTO_ENTER);
   }
   return TRUE;
 }
diff --git a/cg/cg0200a.uml b/cg/cg0200a.uml
index d6261351d..fc0bdd777 100755
--- a/cg/cg0200a.uml
+++ b/cg/cg0200a.uml
@@ -375,7 +375,7 @@ END
 GROUPBOX DLG_NULL 76 7
 BEGIN
   PROMPT 1 4 "Numeri telefonici"
-END
+END                             
 
 STRING F_PTEL 10
 BEGIN