diff --git a/client_payments.php b/client_payments.php
index bc321cfd..02ebd5af 100644
--- a/client_payments.php
+++ b/client_payments.php
@@ -77,7 +77,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $invoice_prefix = htmlentities($row['invoice_prefix']);
             $invoice_number = htmlentities($row['invoice_number']);
             $invoice_status = htmlentities($row['invoice_status']);
-            $invoice_amount = htmlentities($row['invoice_amount']);
+            $invoice_amount = floatval($row['invoice_amount']);
             $invoice_currency_code = htmlentities($row['invoice_currency_code']);
             $invoice_date = $row['invoice_date'];
             $payment_date = $row['payment_date'];
@@ -88,7 +88,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             }else{
               $payment_reference_display = $payment_reference;
             }
-            $payment_amount = htmlentities($row['payment_amount']);
+            $payment_amount = floatval($row['payment_amount']);
             $payment_currency_code = htmlentities($row['payment_currency_code']);
             $account_name = htmlentities($row['account_name']);
 
diff --git a/dashboard_financial.php b/dashboard_financial.php
index f541f49a..eba3b0ce 100644
--- a/dashboard_financial.php
+++ b/dashboard_financial.php
@@ -394,7 +394,7 @@ $vendors_added = $row['vendors_added'];
             <?php
           	while($row = mysqli_fetch_array($sql_latest_invoice_payments)){
 	            $payment_date = $row['payment_date'];
-	            $payment_amount = htmlentities($row['payment_amount']);
+	            $payment_amount = floatval($row['payment_amount']);
 	            $invoice_prefix = htmlentities($row['invoice_prefix']);
               $invoice_number = htmlentities($row['invoice_number']);
 	            $client_name = htmlentities($row['client_name']);
@@ -437,7 +437,7 @@ $vendors_added = $row['vendors_added'];
           	<?php
           	while($row = mysqli_fetch_array($sql_latest_expenses)){
 	            $expense_date = $row['expense_date'];
-	            $expense_amount = htmlentities($row['expense_amount']);
+	            $expense_amount = floatval($row['expense_amount']);
 	            $vendor_name = htmlentities($row['vendor_name']);
 	            $category_name = htmlentities($row['category_name']);
 
diff --git a/expense_add_modal.php b/expense_add_modal.php
index 303f9587..38c6c133 100644
--- a/expense_add_modal.php
+++ b/expense_add_modal.php
@@ -47,7 +47,7 @@
                   while($row = mysqli_fetch_array($sql)){
                     $account_id = $row['account_id'];
                     $account_name = htmlentities($row['account_name']);
-                    $opening_balance = htmlentities($row['opening_balance']);
+                    $opening_balance = floatval($row['opening_balance']);
                     
                     $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                     $row = mysqli_fetch_array($sql_payments);
diff --git a/expense_copy_modal.php b/expense_copy_modal.php
index 8c53c1e3..a2f6f137 100644
--- a/expense_copy_modal.php
+++ b/expense_copy_modal.php
@@ -48,7 +48,7 @@
                   while($row = mysqli_fetch_array($sql_accounts)){
                     $account_id_select = $row['account_id'];
                     $account_name_select = htmlentities($row['account_name']);
-                    $opening_balance = htmlentities($row['opening_balance']);
+                    $opening_balance = floatval($row['opening_balance']);
                     
                     $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
                     $row = mysqli_fetch_array($sql_payments);
diff --git a/expense_edit_modal.php b/expense_edit_modal.php
index 1625d04f..c98f003b 100644
--- a/expense_edit_modal.php
+++ b/expense_edit_modal.php
@@ -50,7 +50,7 @@
                   while($row = mysqli_fetch_array($sql_accounts)){
                     $account_id_select = $row['account_id'];
                     $account_name_select = htmlentities($row['account_name']);
-                    $opening_balance = htmlentities($row['opening_balance']);
+                    $opening_balance = floatval($row['opening_balance']);
                     
                     $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
                     $row = mysqli_fetch_array($sql_payments);
diff --git a/expenses.php b/expenses.php
index 977280d6..a13ec5d0 100644
--- a/expenses.php
+++ b/expenses.php
@@ -149,7 +149,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
           while($row = mysqli_fetch_array($sql)){
             $expense_id = $row['expense_id'];
             $expense_date = $row['expense_date'];
-            $expense_amount = htmlentities($row['expense_amount']);
+            $expense_amount = floatval($row['expense_amount']);
             $expense_currency_code = htmlentities($row['expense_currency_code']);
             $expense_description = htmlentities($row['expense_description']);
             $expense_receipt = htmlentities($row['expense_receipt']);
diff --git a/guest_view_invoice.php b/guest_view_invoice.php
index 104ab558..0994bbe8 100644
--- a/guest_view_invoice.php
+++ b/guest_view_invoice.php
@@ -220,7 +220,6 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
                     $item_description = htmlentities($row['item_description']);
                     $item_quantity = floatval($row['item_quantity']);
                     $item_price = floatval($row['item_price']);
-                    $item_subtotal = floatval($row['item_price']);
                     $item_tax = floatval($row['item_tax']);
                     $item_total = floatval($row['item_total']);
                     $total_tax = $item_tax + $total_tax;
diff --git a/invoice_payment_add_modal.php b/invoice_payment_add_modal.php
index a9494d62..b979e42d 100644
--- a/invoice_payment_add_modal.php
+++ b/invoice_payment_add_modal.php
@@ -57,7 +57,7 @@
                 $sql = mysqli_query($mysqli,"SELECT * FROM accounts WHERE account_archived_at IS NULL AND company_id = $session_company_id ORDER BY account_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
                   $account_id = $row['account_id'];
-                  $account_name = $row['account_name'];
+                  $account_name = htmlentities($row['account_name']);
                   $opening_balance = $row['opening_balance'];
                   
                   $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
@@ -96,7 +96,7 @@
                 
                 $sql = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Payment Method' AND category_archived_at IS NULL AND company_id = $session_company_id ORDER BY category_name ASC"); 
                 while($row = mysqli_fetch_array($sql)){
-                  $category_name = $row['category_name'];
+                  $category_name = htmlentities($row['category_name']);
                 ?>
                   <option <?php if($config_default_payment_method == $category_name){ echo "selected"; } ?>><?php echo $category_name; ?></option>
                 
diff --git a/item_edit_modal.php b/item_edit_modal.php
index 2e4c74b3..9d59c967 100644
--- a/item_edit_modal.php
+++ b/item_edit_modal.php
@@ -80,7 +80,7 @@
                 $taxes_sql = mysqli_query($mysqli,"SELECT * FROM taxes WHERE (tax_archived_at > '$item_created_at' OR tax_archived_at IS NULL) AND company_id = $session_company_id ORDER BY tax_name ASC"); 
                 while($row = mysqli_fetch_array($taxes_sql)){
                   $tax_id_select = $row['tax_id'];
-                  $tax_name = $row['tax_name'];
+                  $tax_name = htmlentities($row['tax_name']);
                   $tax_percent = $row['tax_percent'];
                 ?>
                   <option <?php if($tax_id_select == $tax_id){ echo "selected"; } ?> value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
diff --git a/payments.php b/payments.php
index 66c8cf89..93c95998 100644
--- a/payments.php
+++ b/payments.php
@@ -145,7 +145,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $invoice_date = $row['invoice_date'];
             $payment_date = $row['payment_date'];
             $payment_method = htmlentities($row['payment_method']);
-            $payment_amount = htmlentities($row['payment_amount']);
+            $payment_amount = floatval($row['payment_amount']);
             $payment_currency_code = htmlentities($row['payment_currency_code']);
             $payment_reference = htmlentities($row['payment_reference']);
             if(empty($payment_reference)){
diff --git a/products.php b/products.php
index 20c7d9b1..2d44fa5d 100644
--- a/products.php
+++ b/products.php
@@ -64,7 +64,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             }else{
               $product_description_display = "<div style='white-space:pre-line'>$product_description</div>";
             }
-            $product_price = htmlentities($row['product_price']);
+            $product_price = floatval($row['product_price']);
             $product_currency_code = htmlentities($row['product_currency_code']);
             $product_created_at = $row['product_created_at'];
             $category_id = $row['category_id'];
diff --git a/recurring_invoice.php b/recurring_invoice.php
index 43f1385f..ba869503 100644
--- a/recurring_invoice.php
+++ b/recurring_invoice.php
@@ -27,7 +27,7 @@ if(isset($_GET['recurring_id'])){
     $recurring_last_sent = '-';
   }
   $recurring_next_date = $row['recurring_next_date'];
-  $recurring_amount = float($row['recurring_amount']);
+  $recurring_amount = floatval($row['recurring_amount']);
   $recurring_currency_code = htmlentities($row['recurring_currency_code']);
   $recurring_note = htmlentities($row['recurring_note']);
   $recurring_created_at = $row['recurring_created_at'];
@@ -287,17 +287,17 @@ if(isset($_GET['recurring_id'])){
           <tbody>    
             <tr class="border-bottom">
               <td>Subtotal</td>
-              <td class="text-right"><?php echo htmlentities(numfmt_format_currency($currency_format, $sub_total, $recurring_currency_code)); ?></td>
+              <td class="text-right"><?php echo numfmt_format_currency($currency_format, $sub_total, $recurring_currency_code); ?></td>
             </tr>
             <?php if($total_tax > 0){ ?>
             <tr class="border-bottom">
               <td>Tax</td>
-              <td class="text-right"><?php echo htmlentities(numfmt_format_currency($currency_format, $total_tax, $recurring_currency_code)); ?></td>        
+              <td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_tax, $recurring_currency_code); ?></td>        
             </tr>
             <?php } ?>
             <tr class="border-bottom">
               <td><strong>Amount</strong></td>
-              <td class="text-right"><strong><?php echo htmlentities(numfmt_format_currency($currency_format, $recurring_amount, $recurring_currency_code)); ?></strong></td>
+              <td class="text-right"><strong><?php echo numfmt_format_currency($currency_format, $recurring_amount, $recurring_currency_code); ?></strong></td>
             </tr>
           </tbody>
         </table>
diff --git a/revenue_add_modal.php b/revenue_add_modal.php
index 8144fdab..2cded3f6 100644
--- a/revenue_add_modal.php
+++ b/revenue_add_modal.php
@@ -65,7 +65,7 @@
                     while($row = mysqli_fetch_array($sql)){
                       $account_id = $row['account_id'];
                       $account_name = htmlentities($row['account_name']);
-                      $opening_balance = htmlentities($row['opening_balance']);
+                      $opening_balance = floatval($row['opening_balance']);
                       
                       $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                       $row = mysqli_fetch_array($sql_payments);
diff --git a/revenue_edit_modal.php b/revenue_edit_modal.php
index 8fcf9398..c5f8eed9 100644
--- a/revenue_edit_modal.php
+++ b/revenue_edit_modal.php
@@ -66,7 +66,7 @@
                   while($row = mysqli_fetch_array($sql_accounts)){
                     $account_id_select = $row['account_id'];
                     $account_name_select = htmlentities($row['account_name']);
-                    $opening_balance = htmlentities($row['opening_balance']);
+                    $opening_balance = floatval($row['opening_balance']);
                     
                     $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
                     $row = mysqli_fetch_array($sql_payments);
diff --git a/revenues.php b/revenues.php
index a73bcccc..7b9f8dce 100644
--- a/revenues.php
+++ b/revenues.php
@@ -148,7 +148,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             }
             $revenue_date = $row['revenue_date'];
             $revenue_payment_method = htmlentities($row['revenue_payment_method']);
-            $revenue_amount = htmlentities($row['revenue_amount']);
+            $revenue_amount = floatval($row['revenue_amount']);
             $revenue_currency_code = htmlentities($row['revenue_currency_code']);
             $revenue_created_at = $row['revenue_created_at'];
             $account_id = $row['account_id'];
diff --git a/transfer_add_modal.php b/transfer_add_modal.php
index 5dfe582b..79d7338a 100644
--- a/transfer_add_modal.php
+++ b/transfer_add_modal.php
@@ -48,7 +48,7 @@
                 while($row = mysqli_fetch_array($sql)){
                   $account_id = $row['account_id'];
                   $account_name = htmlentities($row['account_name']);
-                  $opening_balance = htmlentities($row['opening_balance']);
+                  $opening_balance = floatval($row['opening_balance']);
                   
                   $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                   $row = mysqli_fetch_array($sql_payments);
@@ -87,7 +87,7 @@
                 while($row = mysqli_fetch_array($sql)){
                   $account_id = $row['account_id'];
                   $account_name = htmlentities($row['account_name']);
-                  $opening_balance = htmlentities($row['opening_balance']);
+                  $opening_balance = floatval($row['opening_balance']);
                 
                   $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id");
                   $row = mysqli_fetch_array($sql_payments);
diff --git a/transfer_edit_modal.php b/transfer_edit_modal.php
index 1162e8f4..f2183e0e 100644
--- a/transfer_edit_modal.php
+++ b/transfer_edit_modal.php
@@ -51,7 +51,7 @@
                   while($row = mysqli_fetch_array($sql_accounts)){
                     $account_id_select = $row['account_id'];
                     $account_name_select = htmlentities($row['account_name']);
-                    $opening_balance = htmlentities($row['opening_balance']);
+                    $opening_balance = floatval($row['opening_balance']);
                     
                     $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id_select");
                     $row = mysqli_fetch_array($sql_payments);
@@ -89,7 +89,7 @@
                 while($row = mysqli_fetch_array($sql2)){
                   $account_id2 = $row['account_id'];
                   $account_name = htmlentities($row['account_name']);
-                  $opening_balance = htmlentities($row['opening_balance']);
+                  $opening_balance = floatval($row['opening_balance']);
 
                   $sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE payment_account_id = $account_id2");
                   $row = mysqli_fetch_array($sql_payments);
diff --git a/transfers.php b/transfers.php
index a92a8dda..16511926 100644
--- a/transfers.php
+++ b/transfers.php
@@ -141,7 +141,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
             $transfer_date = $row['transfer_date'];
             $transfer_account_from = $row['transfer_account_from'];
             $transfer_account_to = $row['transfer_account_to'];
-            $transfer_amount = htmlentities($row['transfer_amount']);
+            $transfer_amount = floatval($row['transfer_amount']);
             $transfer_notes = htmlentities($row['transfer_notes']);
             $transfer_created_at = $row['transfer_created_at'];
             $expense_id = $row['transfer_expense_id'];