diff --git a/ba/ba8200.cpp b/ba/ba8200.cpp
index 075c7a966..f9aa5f561 100755
--- a/ba/ba8200.cpp
+++ b/ba/ba8200.cpp
@@ -932,7 +932,11 @@ void TQuery_mask::save_as(TRecordsetExportFormat fmt)
   strcpy(fs.name, get(F_CODICE));
   strcpy(fs.type, ext);
   strcpy(fs.creator, "AGA"); */
-  path.add(get(F_CODICE)); path.ext(ext);
+  if (field(F_CODICE).empty())
+    path.add("query"); 
+  else
+    path.add(get(F_CODICE)); 
+  path.ext(ext);
   xvt_fsys_convert_str_to_fspec(path, &fs);
   
   xvt_fsys_save_dir();
@@ -941,8 +945,7 @@ void TQuery_mask::save_as(TRecordsetExportFormat fmt)
 
   if (good)
   {
-    xvt_fsys_convert_dir_to_str(&fs.dir, path.get_buffer(), path.size());
-    path.add(fs.name);
+    xvt_fsys_convert_fspec_to_str(&fs, path.get_buffer(), path.size());
     if (rex->save_as(path, fmt))
       xvt_sys_goto_url(path, "open");
   }
@@ -1299,7 +1302,6 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
     if (e == fe_init || e == fe_modify)
     {
       const bool on = !o.empty();
-      enable(-2, on);
       enable(F_EXPORT_DBF, on && is_power_station());
       if (e == fe_modify)
       {
diff --git a/ba/ba8200a.uml b/ba/ba8200a.uml
index f7838b778..5ec1c5d70 100755
--- a/ba/ba8200a.uml
+++ b/ba/ba8200a.uml
@@ -4,7 +4,7 @@ TOOLBAR "" 0 0 0 2
 
 BUTTON DLG_SAVEREC 10 2
 BEGIN
-  PROMPT -15 -11 ""
+  PROMPT -15 -11 "~Salva"
   PICTURE BMP_SAVEREC
   PICTURE BMP_SAVERECDN
 END
@@ -18,7 +18,7 @@ END
 
 BUTTON DLG_DELREC 10 2
 BEGIN
-  PROMPT -35 -11 ""
+  PROMPT -35 -11 "Elimina"
   PICTURE BMP_DELREC
   PICTURE BMP_DELRECDN
 END
@@ -29,6 +29,18 @@ BEGIN
   PICTURE 166
 END
 
+BUTTON DLG_INFO 10 2
+BEGIN
+  PROMPT -45 -11 "Info"
+  PICTURE BMP_INFO
+END
+
+BUTTON DLG_HELP 10 2
+BEGIN
+  PROMPT -45 -11 "Help"
+  PICTURE BMP_HELP
+END
+
 BUTTON DLG_QUIT 10 2
 BEGIN
   PROMPT -55 -11 ""
@@ -137,7 +149,7 @@ END
 BUTTON F_EDITQUERY 10 2
 BEGIN
   PROMPT -16 -1 ""
-  PICTURE BMP_EDIT
+  PICTURE BMP_ELABORA
   GROUP 2
 END