diff --git a/ba/ba0.cpp b/ba/ba0.cpp
index e65ad6748..e267e2292 100755
--- a/ba/ba0.cpp
+++ b/ba/ba0.cpp
@@ -369,8 +369,7 @@ int TMenu_application::do_level()
       n = format("ba%02d.bmp", id = 0);
     
     TImage* image = new TImage(n);  
-    if (MASK_BACK_COLOR != COLOR_DKCYAN)
-      image->set_clut(6, MASK_BACK_COLOR);
+    image->convert_transparent_color();
     _images.add(image, id);
   }
 
diff --git a/ba/ba1100.cpp b/ba/ba1100.cpp
index 0ee628d65..7a96674b5 100755
--- a/ba/ba1100.cpp
+++ b/ba/ba1100.cpp
@@ -434,8 +434,9 @@ void TManutenzione_app::edit_riga (long riga_sel, TToken_string& riga)
     if (logicnum > 1) 
     {
       const TFilename filename(_mask->get(FLD_NOME));
+      const TString tabella(_mask->get(F_TAB));
       TEdit_file ef;
-      ef.browse(logicnum, filename);
+      ef.browse(logicnum, filename, tabella);
     }
     break;
   case K_F5:
diff --git a/ba/ba1100.h b/ba/ba1100.h
index 1c5aa520a..58b0ad49e 100755
--- a/ba/ba1100.h
+++ b/ba/ba1100.h
@@ -80,7 +80,7 @@ protected:
   KEY  edit_record(TRectype& rec, bool readonly = FALSE);
 
 public:
-  bool browse(int num, const char* name);
+  bool browse(int logicnum, const TFilename& name, const TString& tab);
   TEdit_file() {} 
   virtual ~TEdit_file() {}
 };
diff --git a/ba/ba1102.cpp b/ba/ba1102.cpp
index c058ec563..bd543bed7 100755
--- a/ba/ba1102.cpp
+++ b/ba/ba1102.cpp
@@ -6,13 +6,7 @@
 
 #include "ba1100.h"
 
-// ORRIBILERRIMO
-// ma chemmefotte?                       
-HIDDEN TRectype*  __rec;
-HIDDEN TRelation* __rel;
-HIDDEN TMask*     __msk;
-
-bool TEdit_file::browse(int logicnum, const char* name)
+bool TEdit_file::browse(int logicnum, const TFilename& name, const TString& tab)
 {
   TRelation relation(logicnum);
   TCursor cursor(&relation);
@@ -22,9 +16,15 @@ bool TEdit_file::browse(int logicnum, const char* name)
   TToken_string head(256);
   TToken_string trac(256);
   
-  // DIO CHE ORRORE! MA CHECCEPOSSOFA'?                 
-  __rel = &relation;                      
-  // E POI, DICIAMOLO, CHEMMEFOTTAMME'?
+  if (logicnum == LF_TAB || logicnum == LF_TABCOM || logicnum == LF_TABGEN) 
+  {
+    if (tab.len() == 3)  // Filtra la tabella interessata
+    {
+      TRectype filter(logicnum);
+      filter.put("COD", tab);
+      cursor.setregion(filter, filter);
+    }  
+  }  
   
   const char* n;
   trac.add("");