diff --git a/src/ba/ba8301.cpp b/src/ba/ba8301.cpp
index 8c2a0c9fb..cc326659a 100755
--- a/src/ba/ba8301.cpp
+++ b/src/ba/ba8301.cpp
@@ -730,7 +730,7 @@ void TReport_field_mask::vedo_non_vedo()
   enable(DLG_FINDREC, is_text && type != 'T');
   show(F_CODVAL,      is_currency);  // Codice valuta di riferimento
   show(F_LINK,        strchr("DNS", type) != NULL); // Chi puo' essere un link?
-  show(F_PRESCRIPT,   is_text);
+  show(F_PRESCRIPT,   is_text || type == 'I');
   show(F_POSTSCRIPT,  is_text);
   enable_page(3, type == 'A');
 
diff --git a/src/ba/ba8500.cpp b/src/ba/ba8500.cpp
index 7ed501df1..96b52a51e 100755
--- a/src/ba/ba8500.cpp
+++ b/src/ba/ba8500.cpp
@@ -149,6 +149,12 @@ TReport* TKlarkKent_app::create_report(const char* name) const
 {
   TReport* r = new TReport;
   r->load(name);
+
+  TString custom_query;
+  
+  get_custom_query("", name, custom_query);
+  if (custom_query.full())
+    r->set_recordset(custom_query);
   return r;
 }