diff --git a/client/src/js/components/bhYesNoRadios.js b/client/src/js/components/bhYesNoRadios.js
index 63a9c5ca97..db00b5aaa3 100644
--- a/client/src/js/components/bhYesNoRadios.js
+++ b/client/src/js/components/bhYesNoRadios.js
@@ -7,6 +7,7 @@ angular.module('bhima.components')
       helpText : '@?',
       onChangeCallback : '&',
     },
+    transclude  : true,
     templateUrl : 'modules/templates/bhYesNoRadios.tmpl.html',
     controller : YesNoRadioController,
   });
@@ -21,7 +22,7 @@ function YesNoRadioController() {
   const $ctrl = this;
 
   $ctrl.$onInit = () => {
-    $ctrl.value = Number.parseInt($ctrl.value, 10);
+    $ctrl.value = $ctrl.value ? Number.parseInt($ctrl.value, 10) : undefined;
   };
 
   $ctrl.onChange = (value) => {
diff --git a/client/src/modules/cash/payments/templates/search.modal.html b/client/src/modules/cash/payments/templates/search.modal.html
index 451954d16c..d4b4fd1be7 100644
--- a/client/src/modules/cash/payments/templates/search.modal.html
+++ b/client/src/modules/cash/payments/templates/search.modal.html
@@ -48,12 +48,12 @@
           </bh-debtor-group-select>
 
           <!-- filter out cautions -->
-          <div class="checkbox">
-            <label>
-              <input type="checkbox" name="is_caution" ng-true-value="1" ng-false-value="0" ng-model="$ctrl.searchQueries.is_caution">
-              <span translate>FORM.LABELS.CAUTION</span>
-            </label>
-          </div>
+          <bh-yes-no-radios
+            label="FORM.LABELS.CAUTION"
+            value="$ctrl.searchQueries.is_caution"
+            on-change-callback="$ctrl.onCautionChange(value)">
+            <bh-clear on-clear="$ctrl.clear('is_caution')"></bh-clear>
+          </bh-yes-no-radios>
 
           <!-- cashbox -->
           <bh-cashbox-select
diff --git a/client/src/modules/cash/payments/templates/search.modal.js b/client/src/modules/cash/payments/templates/search.modal.js
index a0cd805805..8e49175803 100644
--- a/client/src/modules/cash/payments/templates/search.modal.js
+++ b/client/src/modules/cash/payments/templates/search.modal.js
@@ -81,6 +81,11 @@ function SearchCashPaymentModalController(Notify, Instance, filters, Store, Peri
     vm.searchQueries.cashbox_id = cashbox.id;
   };
 
+  // on caution change
+  vm.onCautionChange = value => {
+    vm.searchQueries.is_caution = value;
+  };
+
   vm.setCurrency = function setCurrency(currencyId) {
     vm.currencies.forEach(currency => {
       if (currency.id === currencyId) {
diff --git a/client/src/modules/templates/bhYesNoRadios.tmpl.html b/client/src/modules/templates/bhYesNoRadios.tmpl.html
index 717046e6e7..7bcc336dce 100644
--- a/client/src/modules/templates/bhYesNoRadios.tmpl.html
+++ b/client/src/modules/templates/bhYesNoRadios.tmpl.html
@@ -3,6 +3,8 @@
     {{$ctrl.label}}
   </label>
 
+  <ng-transclude></ng-transclude>
+
   <div>
     <label class="radio-inline">
       <input
diff --git a/server/controllers/finance/reports/cashflow/index.js b/server/controllers/finance/reports/cashflow/index.js
index 8c7a81aefe..897d5f7a78 100644
--- a/server/controllers/finance/reports/cashflow/index.js
+++ b/server/controllers/finance/reports/cashflow/index.js
@@ -117,7 +117,7 @@ function reportByService(req, res, next) {
   db.one(cashboxDetailsSql, cashboxId)
     .then(cashbox => {
       data.cashbox = cashbox;
-      return db.exec(cashflowByServiceSql, [dateFrom, dateTo, cashboxId]);
+      return db.exec(cashflowByServiceSql, [dateFrom, dateTo, cashbox.id]);
     })
     .then((rows) => {
       data.rows = rows;
@@ -177,7 +177,7 @@ function reportByService(req, res, next) {
       data.matrix = matrix;
 
       // query the aggregates
-      return db.exec(serviceAggregationSql, [dateFrom, dateTo, cashboxId]);
+      return db.exec(serviceAggregationSql, [dateFrom, dateTo, data.cashbox.id]);
     })
     .then((aggregates) => {
       data.aggregates = aggregates;