diff --git a/misc/waku-messages/message/waku-message-body.dmn b/misc/waku-messages/message/waku-message-body.dmn
index 521906e4..bf253ed6 100644
--- a/misc/waku-messages/message/waku-message-body.dmn
+++ b/misc/waku-messages/message/waku-message-body.dmn
@@ -13,13 +13,13 @@
         </inputExpression>
       </input>
       <input id="InputClause_1ehumxj" label="PL Comments?" biodi:width="150">
-        <inputExpression id="LiteralExpression_0f6zpyb" typeRef="number">
-          <text>len_project_lead_comments</text>
+        <inputExpression id="LiteralExpression_0f6zpyb" typeRef="boolean">
+          <text>len_project_lead_comment &gt; 0</text>
         </inputExpression>
       </input>
       <input id="InputClause_0vbjfl3" label="Finance Comments?" biodi:width="174">
         <inputExpression id="LiteralExpression_16asvyu" typeRef="number">
-          <text>len_finance_comments</text>
+          <text>len_finance_comment &gt; 0</text>
         </inputExpression>
       </input>
       <output id="output_1" label="Message Body" name="waku_message_body" typeRef="string" biodi:width="532" />
@@ -82,10 +82,10 @@
           <text>"waku_invoice_rejected_ismatch"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1oiu30e">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1qhjo2q">
-          <text>&gt;0</text>
+          <text>True</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0l1e3xh">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by Finance. The reason specified for the rejection is: " + invoice.commentsFinance</text>
@@ -99,10 +99,10 @@
           <text>"waku_invoice_rejected_ismatch"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1183w4d">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1a8casu">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_057w88m">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by Finance."</text>
@@ -116,10 +116,10 @@
           <text>"waku_invoice_rejected_not_ismatch_not_pl_approve"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1rqyjru">
-          <text>&gt;0</text>
+          <text>True</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0b1859y">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_19448fp">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by your Project Lead. The reason specified for the rejection is: " + invoice.commentsProjectLead</text>
@@ -133,10 +133,10 @@
           <text>"waku_invoice_rejected_not_ismatch_not_pl_approve"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_15eku2z">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <inputEntry id="UnaryTests_00o5xzv">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_04zz3q5">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by your Project Lead."</text>
@@ -150,10 +150,10 @@
           <text>"waku_invoice_rejected_not_ismatch_pl_approve"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_1xqwyfp">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0zpo3f1">
-          <text>&gt;0</text>
+          <text>True</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0eqnx58">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by Finance. The reason specified for the rejection is: " + invoice.commentsFinance</text>
@@ -167,10 +167,10 @@
           <text>"waku_invoice_rejected_not_ismatch_pl_approve"</text>
         </inputEntry>
         <inputEntry id="UnaryTests_0hdqam5">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <inputEntry id="UnaryTests_19z295i">
-          <text>0</text>
+          <text>False</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_1j8scli">
           <text>"Hi " + current_user_extras["first_name"] + ", your invoice has been rejected by Finance."</text>