diff --git a/expert/browser/report.pt b/expert/browser/report.pt
index 02b78b9..ea8bbb9 100755
--- a/expert/browser/report.pt
+++ b/expert/browser/report.pt
@@ -16,7 +16,8 @@
         <div metal:use-macro="item/report_macros/params" />
         <div metal:define-macro="buttons">
           <input type="submit" name="report_execute" value="Execute Report"
-                 i18n:attributes="value" />
+                 i18n:attributes="value"
+                 tal:condition="item/queryFields" />
           <input type="submit"
                  tal:condition="item/reportDownload"
                  tal:attributes="name string:${item/reportDownload}:method;
diff --git a/expert/field.py b/expert/field.py
index 045d724..56e962b 100644
--- a/expert/field.py
+++ b/expert/field.py
@@ -92,7 +92,7 @@ class DecimalField(Field):
 
 
 class IntegerField(Field):
-    
+
     renderer = cssClass = 'right'
     dbtype = 'integer'
 
@@ -135,11 +135,11 @@ class StateField(Field):
         elif row.context is None:
             return None
         else:
-            stf = component.getAdapter(baseObject(row.context), IStateful, 
+            stf = component.getAdapter(baseObject(row.context), IStateful,
                                         name=self.statesDefinition)
         stateObject = stf.getStateObject()
         icon = stateObject.icon or 'led%s.png' % stateObject.color
-        return dict(title=self.translate(stateObject.title), 
+        return dict(title=self.translate(stateObject.title),
                     icon='cybertools.icons/' + icon)
 
     def translate(self, text):
@@ -277,4 +277,4 @@ class SubReportField(Field):
         rs = ri.getResults()
         ri.view.resultSets[ri.name] = rs
         return rs
-    
+