diff --git a/db_tracking.php b/db_tracking.php
index df1106e83b..29d8cc85b1 100644
--- a/db_tracking.php
+++ b/db_tracking.php
@@ -67,9 +67,9 @@ require_once './libraries/db_links.inc.php';
 $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' .
              PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . '.' .
              PMA_backquote($GLOBALS['cfg']['Server']['tracking']) .
-             ' WHERE ' . PMA_backquote('db_name')    . ' = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' .
-             ' GROUP BY '. PMA_backquote('table_name') .
-             ' ORDER BY '. PMA_backquote('table_name') .' ASC';
+             ' WHERE db_name = \'' . PMA_sqlAddSlashes($_REQUEST['db']) . '\' ' .
+             ' GROUP BY table_name' .
+             ' ORDER BY table_name ASC';
 
 $all_tables_result = PMA_query_as_controluser($all_tables_query);
 
diff --git a/js/functions.js b/js/functions.js
index ee83b8acfd..d1c554436c 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -902,26 +902,6 @@ function goToUrl(selObj, goToLocation)
     eval("document.location.href = '" + goToLocation + "pos=" + selObj.options[selObj.selectedIndex].value + "'");
 }
 
-/**
- * getElement
- */
-function getElement(e,f)
-{
-    if(document.layers){
-        f=(f)?f:self;
-        if(f.document.layers[e]) {
-            return f.document.layers[e];
-        }
-        for(W=0;W<f.document.layers.length;W++) {
-            return(getElement(e,f.document.layers[W]));
-        }
-    }
-    if(document.all) {
-        return document.all[e];
-    }
-    return document.getElementById(e);
-}
-
 /**
   * Refresh the WYSIWYG scratchboard after changes have been made
   */
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 512ca2e782..d018cd762f 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -910,7 +910,7 @@ class PMA_Table
                 if ($GLOBALS['cfgRelation']['commwork']) {
                     // Get all comments and MIME-Types for current table
                     $comments_copy_query = 'SELECT
-                                                column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . '
+                                                column_name, comment' . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . '
                                             FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info']) . '
                                             WHERE
                                                 db_name = \'' . PMA_sqlAddSlashes($source_db) . '\' AND
@@ -920,7 +920,7 @@ class PMA_Table
                     // Write every comment as new copied entry. [MIME]
                     while ($comments_copy_row = PMA_DBI_fetch_assoc($comments_copy_rs)) {
                         $new_comment_query = 'REPLACE INTO ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($GLOBALS['cfgRelation']['column_info'])
-                                    . ' (db_name, table_name, column_name, ' . PMA_backquote('comment') . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') '
+                                    . ' (db_name, table_name, column_name, comment' . ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '') . ') '
                                     . ' VALUES('
                                     . '\'' . PMA_sqlAddSlashes($target_db) . '\','
                                     . '\'' . PMA_sqlAddSlashes($target_table) . '\','
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index 947044aa24..aa176eafb7 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -219,8 +219,8 @@ class PMA_Tracker
 
         $sql_query =
         " SELECT tracking_active FROM " . self::$pma_table .
-        " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($dbname) . "' " .
-        " AND " . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($tablename) . "' " .
+        " WHERE db_name = '" . PMA_sqlAddSlashes($dbname) . "' " .
+        " AND table_name = '" . PMA_sqlAddSlashes($tablename) . "' " .
         " ORDER BY version DESC";
 
         $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query));
diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php
index 4ba089a5ec..4710940c23 100644
--- a/libraries/import/docsql.php
+++ b/libraries/import/docsql.php
@@ -66,7 +66,7 @@ if ($data === true && !$error && !$timeout_passed) {
             $qry = '
                  INSERT INTO
                         ' . PMA_backquote($cfgRelation['db']) . '.' . PMA_backquote($cfgRelation['column_info']) . '
-                      (db_name, table_name, column_name, ' . PMA_backquote('comment') . ')
+                      (db_name, table_name, column_name, comment)
                  VALUES (
                         \'' . PMA_sqlAddSlashes($GLOBALS['db']) . '\',
                         \'' . PMA_sqlAddSlashes(trim($tab)) . '\',
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index aa17c4717b..95d60e127b 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -441,6 +441,7 @@ class PMA_User_Schema
     */
     private function _deleteTables($db, $chpage, $tabExist)
     {
+        global $table;
         $_strtrans  = '';
         $_strname   = '';
         $shoot      = false;
@@ -495,12 +496,12 @@ class PMA_User_Schema
                 $drag_x = $temp_sh_page['x'];
                 $drag_y = $temp_sh_page['y'];
 
-                $draginit2      .= ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n";
-                $draginit2       .= '    getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n";
-                $draginit       .= '    getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n";
-                $draginit       .= '    getElement("table_' . $i . '").style.top  = "' . $drag_y . 'px";' . "\n";
-                $reset_draginit .= '    getElement("table_' . $i . '").style.left = "2px";' . "\n";
-                $reset_draginit .= '    getElement("table_' . $i . '").style.top  = "' . (15 * $i) . 'px";' . "\n";
+                $draginit2      .= ' Drag.init($("#table_' . $i . '")[0], null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n";
+                $draginit2      .= '    $("#table_' . $i . '")[0].onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n";
+                $draginit       .= '    $("#table_' . $i . '")[0].style.left = "' . $drag_x . 'px";' . "\n";
+                $draginit       .= '    $("#table_' . $i . '")[0].style.top  = "' . $drag_y . 'px";' . "\n";
+                $reset_draginit .= '    $("#table_' . $i . '")[0].style.left = "2px";' . "\n";
+                $reset_draginit .= '    $("#table_' . $i . '")[0].style.top  = "' . (15 * $i) . 'px";' . "\n";
                 $reset_draginit .= '    document.edcoord.elements["c_table_' . $i . '[x]"].value = "2"' . "\n";
                 $reset_draginit .= '    document.edcoord.elements["c_table_' . $i . '[y]"].value = "' . (15 * $i) . '"' . "\n";
 
@@ -528,13 +529,13 @@ class PMA_User_Schema
         //<![CDATA[
         function PDFinit() {
             refreshLayout();
-            myid = getElement('pdflayout');
+            myid = $('#pdflayout')[0];
             <?php echo $draginit; ?>
             TableDragInit();
         }
 
         function TableDragInit() {
-            myid = getElement('pdflayout');
+            myid = $('#pdflayout')[0];
             <?php echo $draginit2; ?>
         }
 
@@ -683,9 +684,9 @@ class PMA_User_Schema
              */
             $master_tables = 'SELECT COUNT(master_table), master_table'
                            . ' FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['relation'])
-                           . ' WHERE master_db = \'' . $db . '\''
+                           . ' WHERE master_db = \'' . PMA_sqlAddSlashes($db) . '\''
                            . ' GROUP BY master_table'
-                           . ' ORDER BY ' . PMA_backquote('COUNT(master_table)') . ' DESC ';
+                           . ' ORDER BY COUNT(master_table) DESC';
             $master_tables_rs = PMA_query_as_controluser($master_tables, false, PMA_DBI_QUERY_STORE);
             if ($master_tables_rs && PMA_DBI_num_rows($master_tables_rs) > 0) {
                 /* first put all the master tables at beginning
diff --git a/po/de.po b/po/de.po
index 822ed74348..b1bd55893e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12907,18 +12907,6 @@ msgid "concurrent_insert is set to 0"
 msgstr ""
 
 #, fuzzy
-#~| msgid ""
-#~| "The Advisor system can provide recommendations on server variables by "
-#~| "analyzing the server status variables. \n"
-#~| "        Do note however that this system provides recommendations based "
-#~| "on fairly simple calculations and by rule of thumb and \n"
-#~| "        may not necessarily work for your system.\n"
-#~| "        Prior to changing any of the configuration, be sure to know what "
-#~| "you are changing and how to undo the change. Wrong tuning\n"
-#~| "        can have a very negative effect on performance.\n"
-#~| "        The best way to tune the system would be to change only one "
-#~| "setting at a time, observe or benchmark your database, and \n"
-#~| "        undo the change if there was no clearly measurable improvement."
 #~ msgid ""
 #~ "The Advisor system can provide recommendations on server variables by "
 #~ "analyzing the server status variables. <p>Do note however that this "
diff --git a/po/es.po b/po/es.po
index d45f9bd820..ba4b090bec 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12960,18 +12960,6 @@ msgid "concurrent_insert is set to 0"
 msgstr ""
 
 #, fuzzy
-#~| msgid ""
-#~| "The Advisor system can provide recommendations on server variables by "
-#~| "analyzing the server status variables.\n"
-#~| "        Do note however that this system provides recommendations based "
-#~| "on fairly simple calculations and by rule of thumb and\n"
-#~| "        may not necessarily work for your system.\n"
-#~| "        Prior to changing any of the configuration, be sure to know what "
-#~| "you are changing and how to undo the change. Wrong tuning\n"
-#~| "        can have a very negative effect on performance.\n"
-#~| "        The best way to tune the system would be to change only one "
-#~| "setting at a time, observe or benchmark your database, and\n"
-#~| "        undo the change if there was no clearly measurable improvement."
 #~ msgid ""
 #~ "The Advisor system can provide recommendations on server variables by "
 #~ "analyzing the server status variables. <p>Do note however that this "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d8ee9f605f..4902bd6b5a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12325,18 +12325,6 @@ msgid "concurrent_insert is set to 0"
 msgstr ""
 
 #, fuzzy
-#~| msgid ""
-#~| "The Advisor system can provide recommendations on server variables by "
-#~| "analyzing the server status variables.\n"
-#~| "        Do note however that this system provides recommendations based "
-#~| "on fairly simple calculations and by rule of thumb and\n"
-#~| "        may not necessarily work for your system.\n"
-#~| "        Prior to changing any of the configuration, be sure to know what "
-#~| "you are changing and how to undo the change. Wrong tuning\n"
-#~| "        can have a very negative effect on performance.\n"
-#~| "        The best way to tune the system would be to change only one "
-#~| "setting at a time, observe or benchmark your database, and\n"
-#~| "        undo the change if there was no clearly measurable improvement."
 #~ msgid ""
 #~ "The Advisor system can provide recommendations on server variables by "
 #~ "analyzing the server status variables. <p>Do note however that this "
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 76ed16ab33..b601348ea4 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -575,8 +575,8 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
 $sql_query = " SELECT DISTINCT db_name, table_name FROM " .
              PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." .
              PMA_backquote($GLOBALS['cfg']['Server']['tracking']) .
-             " WHERE " . PMA_backquote('db_name') . " = '" . PMA_sqlAddSlashes($GLOBALS['db']) . "' " .
-             " ORDER BY ". PMA_backquote('db_name') . ", " . PMA_backquote('table_name');
+             " WHERE db_name = '" . PMA_sqlAddSlashes($GLOBALS['db']) . "' " .
+             " ORDER BY db_name, table_name";
 
 $sql_result = PMA_query_as_controluser($sql_query);
 
@@ -615,9 +615,9 @@ if (PMA_DBI_num_rows($sql_result) > 0) {
 $sql_query = " SELECT * FROM " .
              PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) . "." .
              PMA_backquote($GLOBALS['cfg']['Server']['tracking']) .
-             " WHERE " . PMA_backquote('db_name')    . " = '" . PMA_sqlAddSlashes($_REQUEST['db']) . "' ".
-             " AND "   . PMA_backquote('table_name') . " = '" . PMA_sqlAddSlashes($_REQUEST['table']) ."' ".
-             " ORDER BY ". PMA_backquote('version') . " DESC ";
+             " WHERE db_name = '" . PMA_sqlAddSlashes($_REQUEST['db']) . "' ".
+             " AND table_name = '" . PMA_sqlAddSlashes($_REQUEST['table']) ."' ".
+             " ORDER BY version DESC ";
 
 $sql_result = PMA_query_as_controluser($sql_query);