diff --git a/html/includes/table/device_mibs.inc.php b/html/includes/table/device_mibs.inc.php
index 22b77e8fc..6228df94c 100644
--- a/html/includes/table/device_mibs.inc.php
+++ b/html/includes/table/device_mibs.inc.php
@@ -46,7 +46,7 @@ else {
 
 // all columns are searchable - search across them
 if (isset($searchPhrase) && !empty($searchPhrase)) {
-    $searchsql = implode(' OR ', array_map("search_phrase_column", array_map("quote_sql_word", $columns)));
+    $searchsql = implode(' OR ', array_map("search_phrase_column", array_map("mres", $columns)));
     $wheresql .= " AND ( $searchsql )";
 }
 $sql .= $wheresql;
@@ -59,7 +59,7 @@ if (empty($total)) {
 
 // set up default sort
 if (!isset($sort) || empty($sort)) {
-    $sort = implode(', ', array_map("quote_sql_word", array_slice($columns, 0, $sortcolumns)));
+    $sort = implode(', ', array_map("mres", array_slice($columns, 0, $sortcolumns)));
 }
 $sql .= " ORDER BY $sort";
 
diff --git a/html/includes/table/device_oids.inc.php b/html/includes/table/device_oids.inc.php
index f06ebae1d..3c10730d2 100644
--- a/html/includes/table/device_oids.inc.php
+++ b/html/includes/table/device_oids.inc.php
@@ -37,7 +37,7 @@ $wheresql = ' WHERE `device_id` = ?';
 
 // all columns are searchable - search across them
 if (isset($searchPhrase) && !empty($searchPhrase)) {
-    $searchsql = implode(' OR ', array_map("search_phrase_column", array_map("quote_sql_word", $columns)));
+    $searchsql = implode(' OR ', array_map("search_phrase_column", array_map("mres", $columns)));
     $wheresql .= " AND ( $searchsql )";
 }
 $sql .= $wheresql;
@@ -51,7 +51,7 @@ if (empty($total)) {
 
 // sort by first three columns by default
 if (!isset($sort) || empty($sort)) {
-    $sort = implode(', ', array_map("quote_sql_word", array_slice($columns, 0, 3)));
+    $sort = implode(', ', array_map("mres", array_slice($columns, 0, 3)));
 }
 $sql .= " ORDER BY $sort";
 
diff --git a/html/includes/table/mibs.inc.php b/html/includes/table/mibs.inc.php
index af41b9176..2c9319b37 100644
--- a/html/includes/table/mibs.inc.php
+++ b/html/includes/table/mibs.inc.php
@@ -35,7 +35,7 @@ $sql = 'SELECT * FROM `mibdefs`';
 
 // all columns are searchable - search across them
 if (isset($searchPhrase) && !empty($searchPhrase)) {
-    $searchsql = implode(' OR ', array_map("search_phrase_column", array_map("quote_sql_word", $columns)));
+    $searchsql = implode(' OR ', array_map("search_phrase_column", array_map("mres", $columns)));
     $wheresql .= " WHERE ( $searchsql )";
     $sql .= $wheresql;
 }
@@ -49,7 +49,7 @@ if (empty($total)) {
 
 // sort by first three columns by default
 if (!isset($sort) || empty($sort)) {
-    $sort = implode(', ', array_map("quote_sql_word", array_slice($columns, 0, 3)));
+    $sort = implode(', ', array_map("mres", array_slice($columns, 0, 3)));
 }
 $sql .= " ORDER BY $sort";
 
diff --git a/includes/common.php b/includes/common.php
index 5ec323956..559df195a 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -955,12 +955,6 @@ function search_phrase_column($c)
 } // search_phrase_column
 
 
-function quote_sql_word($c)
-{
-    return "`$c`";
-} // quote_sql_word
-
-
 /**
  * Constructs the path to an RRD for the Ceph application
  * @param string $gtype The type of rrd we're looking for