diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index dbb25c3eea88..89e1754f8795 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -750,6 +750,8 @@ public function preProcessCommon() {
     }
 
     $this->assign('criteriaForm', FALSE);
+    // Will be overwritten in postProcess if TRUE.
+    $this->assign('printOnly', FALSE);
     // Display Report Criteria section if user has access Report Criteria OR administer Reports AND report instance is not reserved
     if (CRM_Core_Permission::check('administer Reports') ||
       CRM_Core_Permission::check('access Report Criteria')
diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index 5ca489a3926b..df49b7d1022e 100644
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -260,6 +260,7 @@ public function __construct() {
           'filters' => [
             'contribution_id' => [
               'title' => ts('Contribution is a pledge payment'),
+              'type' => CRM_Utils_Type::T_BOOLEAN,
             ],
           ],
         ],
diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index a9c0877878da..6cde224c8b0d 100644
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -289,6 +289,7 @@ public function __construct() {
         'filters' => [
           'contribution_id' => [
             'title' => ts('Contribution is a pledge payment'),
+            'type' => CRM_Utils_Type::T_BOOLEAN,
           ],
         ],
       ],
diff --git a/templates/CRM/Report/Form/Layout/Table.tpl b/templates/CRM/Report/Form/Layout/Table.tpl
index 0f3e6ef22a25..871a7b97ed6d 100644
--- a/templates/CRM/Report/Form/Layout/Table.tpl
+++ b/templates/CRM/Report/Form/Layout/Table.tpl
@@ -98,7 +98,7 @@
                     {assign var=fieldHover value=$field|cat:"_hover"}
                     {assign var=fieldClass value=$field|cat:"_class"}
                     <td class="crm-report-{$field}{if $header.type eq 1024 OR $header.type eq 1 OR $header.type eq 512} report-contents-right{elseif $row.$field eq 'Subtotal'} report-label{/if}">
-                        {if !empty($row.$fieldLink)}
+                        {if array_key_exists($fieldLink, $row) && $row.$fieldLink}
                             <a title="{$row.$fieldHover|escape}" href="{$row.$fieldLink}"  {if array_key_exists($fieldClass, $row)} class="{$row.$fieldClass}"{/if}>
                         {/if}
 
@@ -130,7 +130,7 @@
                             {$row.$field}
                         {/if}
 
-                        {if !empty($row.$fieldLink)}</a>{/if}
+                        {if array_key_exists($fieldLink, $row) && $row.$fieldLink}</a>{/if}
                     </td>
                 {/foreach}
             </tr>