diff --git a/agent/clients.php b/agent/clients.php
index cb136ba8..04750196 100644
--- a/agent/clients.php
+++ b/agent/clients.php
@@ -231,7 +231,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     GROUP BY tags.tag_id
                                     HAVING COUNT(client_tags.client_id) > 0 OR tags.tag_id IN ($tag_filter)
                                 ");
-                                while ($row = mysqli_fetch_array($sql_tags_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_tags_filter)) {
                                     $tag_id = intval($row['tag_id']);
                                     $tag_name = nullable_htmlentities($row['tag_name']); ?>
 
@@ -249,7 +249,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                                 <?php
                                 $sql_industries_filter = mysqli_query($mysqli, "SELECT DISTINCT client_type FROM clients WHERE 1 = 1 AND client_$archive_query AND client_type != '' $leads_query ORDER BY client_type ASC");
-                                while ($row = mysqli_fetch_array($sql_industries_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_industries_filter)) {
                                     $industry_name = nullable_htmlentities($row['client_type']);
                                 ?>
                                     <option <?php if ($industry_name == $industry_filter) { echo "selected"; } ?>><?php echo $industry_name; ?></option>
@@ -268,7 +268,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                                 <?php
                                 $sql_referrals_filter = mysqli_query($mysqli, "SELECT DISTINCT client_referral FROM clients WHERE 1 = 1 AND client_$archive_query AND client_referral != '' $leads_query ORDER BY client_referral ASC");
-                                while ($row = mysqli_fetch_array($sql_referrals_filter)) {
+                                while ($row = mysqli_fetch_assoc($sql_referrals_filter)) {
                                     $referral_name = nullable_htmlentities($row['client_referral']);
                                 ?>
                                     <option <?php if ($referral_name == $referral_filter) { echo "selected"; } ?>><?php echo $referral_name; ?></option>
@@ -323,7 +323,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                 <tbody>
                 <?php
 
-                while ($row = mysqli_fetch_array($sql)) {
+                while ($row = mysqli_fetch_assoc($sql)) {
                     $client_id = intval($row['client_id']);
                     $client_name = nullable_htmlentities($row['client_name']);
                     $client_type = nullable_htmlentities($row['client_type']);
@@ -426,7 +426,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     $client_tag_name_display_array = array();
                     $client_tag_id_array = array();
                     $sql_client_tags = mysqli_query($mysqli, "SELECT * FROM client_tags LEFT JOIN tags ON client_tags.tag_id = tags.tag_id WHERE client_id = $client_id ORDER BY tag_name ASC");
-                    while ($row = mysqli_fetch_array($sql_client_tags)) {
+                    while ($row = mysqli_fetch_assoc($sql_client_tags)) {
 
                         $client_tag_id = intval($row['tag_id']);
                         $client_tag_name = nullable_htmlentities($row['tag_name']);
@@ -446,12 +446,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     //Add up all the payments for the invoice and get the total amount paid to the invoice
                     $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status != 'Draft' AND invoice_status != 'Cancelled' AND invoice_status != 'Non-Billable' ");
-                    $row = mysqli_fetch_array($sql_invoice_amounts);
+                    $row = mysqli_fetch_assoc($sql_invoice_amounts);
 
                     $invoice_amounts = floatval($row['invoice_amounts']);
 
                     $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id");
-                    $row = mysqli_fetch_array($sql_amount_paid);
+                    $row = mysqli_fetch_assoc($sql_amount_paid);
 
                     $amount_paid = floatval($row['amount_paid']);
 
@@ -465,19 +465,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
                     // Get Credit Balance
                     $sql_credit_balance = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_balance FROM credits WHERE credit_client_id = $client_id");
-                    $row = mysqli_fetch_array($sql_credit_balance);
+                    $row = mysqli_fetch_assoc($sql_credit_balance);
 
                     $credit_balance = floatval($row['credit_balance']);
 
                     //Get Monthly Recurring Total
                     $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_monthly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'month' AND recurring_invoice_client_id = $client_id");
-                    $row = mysqli_fetch_array($sql_recurring_monthly_total);
+                    $row = mysqli_fetch_assoc($sql_recurring_monthly_total);
 
                     $recurring_monthly_total = floatval($row['recurring_monthly_total']);
 
                     //Get Yearly Recurring Total
                     $sql_recurring_yearly_total = mysqli_query($mysqli, "SELECT SUM(recurring_invoice_amount) AS recurring_yearly_total FROM recurring_invoices WHERE recurring_invoice_status = 1 AND recurring_invoice_frequency = 'year' AND recurring_invoice_client_id = $client_id");
-                    $row = mysqli_fetch_array($sql_recurring_yearly_total);
+                    $row = mysqli_fetch_assoc($sql_recurring_yearly_total);
 
                     $recurring_yearly_total = floatval($row['recurring_yearly_total']) / 12;