diff --git a/src/ca/calib01.cpp b/src/ca/calib01.cpp
index e1a0506da..c01443dbd 100755
--- a/src/ca/calib01.cpp
+++ b/src/ca/calib01.cpp
@@ -1520,8 +1520,6 @@ int TSimple_anal_msk::compute_offset() const
     }
     TLocalisamfile lif(ln);
     const TRecnotype recs = lif.items();
-    if (recs > 2048) // Niente alberi enormi ... per ora
-      delta = 0;
   }
 
   return delta;
@@ -2111,15 +2109,18 @@ void TAnal_app::init_query_mode(TMask& mask)
 		d.set_field("");
   }
 
-  TToken_string keys(m.get_curr_key());
+	if (m.id2pos(F_TREE) > 0)
+	{
+		TToken_string keys(m.get_curr_key());
 
-  for (int j = 0 ; j < i - 1; j++)
-  {
-    const short id = m.get_field_id(j, 1);
-    TEdit_field& e = m.efield(id);
+		for (int j = 0 ; j < i - 1; j++)
+		{
+			const short id = m.get_field_id(j, 1);
+			TEdit_field& e = m.efield(id);
 
-    e.set(keys.get(j));
-  }
+			e.set(keys.get(j));
+		}
+	}
   m.first_focus(m.get_field_id(0, 1));
 }