diff --git a/agent/assets.php b/agent/assets.php
index be854403..9eda4f1e 100644
--- a/agent/assets.php
+++ b/agent/assets.php
@@ -536,10 +536,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $asset_serial_display = "-";
                         }
                         $asset_os = escapeHtml($row['asset_os']);
-                        $asset_ip = getFallBack(escapeHtml($row['interface_ip']));
+                        $asset_ip = escapeHtml($row['interface_ip']) ?: '-';
                         $asset_ipv6 = escapeHtml($row['interface_ipv6']);
                         $asset_nat_ip = escapeHtml($row['interface_nat_ip']);
-                        $asset_mac = escapeHtml(getFallBack($row['interface_mac']));
+                        $asset_mac = escapeHtml($row['interface_mac']) ?: '-';
                         $asset_uri = sanitize_url($row['asset_uri']);
                         $asset_uri_2 = sanitize_url($row['asset_uri_2']);
                         $asset_uri_client = sanitize_url($row['asset_uri_client']);
diff --git a/agent/contacts.php b/agent/contacts.php
index 0881fac9..dbcc15a1 100644
--- a/agent/contacts.php
+++ b/agent/contacts.php
@@ -338,7 +338,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         } else {
                             $contact_title_display = "<small class='text-secondary'>$contact_title</small>";
                         }
-                        $contact_department = getFallBack(escapeHtml($row['contact_department']));
+                        $contact_department = escapeHtml($row['contact_department']) ?: '-';
                         $contact_extension = escapeHtml($row['contact_extension']);
                         if (empty($contact_extension)) {
                             $contact_extension_display = "";
diff --git a/agent/reports/expense_by_vendor.php b/agent/reports/expense_by_vendor.php
index cb13b5a6..95510559 100644
--- a/agent/reports/expense_by_vendor.php
+++ b/agent/reports/expense_by_vendor.php
@@ -76,7 +76,7 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
                 <?php
                 while ($row = mysqli_fetch_assoc($sql_vendor_expenses)) {
                     $vendor_id = intval($row['vendor_id']);
-                    $vendor_name = nullable_htmlentities($row['vendor_name']);
+                    $vendor_name = escapeHtml($row['vendor_name']);
                     $amount_paid = floatval($row['amount_paid']); ?>
 
                     <tr>
diff --git a/agent/software.php b/agent/software.php
index 78ef7266..9511e567 100644
--- a/agent/software.php
+++ b/agent/software.php
@@ -201,7 +201,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                         $software_description = escapeHtml($row['software_description']);
                         $software_version = escapeHtml($row['software_version']);
                         $software_type = escapeHtml($row['software_type']);
-                        $software_license_type = getFallBack(escapeHtml($row['software_license_type']));
+                        $software_license_type = escapeHtml($row['software_license_type']) ?: '-';
                         $software_seats = escapeHtml($row['software_seats']);
                         $software_expire = escapeHtml($row['software_expire']);
                         $vendor_name = escapeHtml($row['vendor_name']);