diff --git a/js/db_multi_table_query.js b/js/db_multi_table_query.js
index da27b0a1c7..33b0b0fd68 100644
--- a/js/db_multi_table_query.js
+++ b/js/db_multi_table_query.js
@@ -73,12 +73,18 @@ AJAX.registerOnload('db_multi_table_query.js', function () {
         }
 
         query = 'SELECT ';
-        query += '`' + escapeBacktick(columns[0][0]) + '`.`' + escapeBacktick(columns[0][1]) + '`';
+        if(columns[0][1] == '*')
+            query += '`' + escapeBacktick(columns[0][0]) + '`.' + escapeBacktick(columns[0][1]) + '';
+        else
+            query += '`' + escapeBacktick(columns[0][0]) + '`.`' + escapeBacktick(columns[0][1]) + '`';
         if (columns[0][2] !== '') {
             query += ' AS ' + columns[0][2];
         }
         for (var i = 1; i < columns.length; i++) {
-            query += ', `' + escapeBacktick(columns[i][0]) + '`.`' + escapeBacktick(columns[i][1]) + '`';
+            if(columns[i][1] == '*')
+                query += ', `' + escapeBacktick(columns[i][0]) + '`.' + escapeBacktick(columns[i][1]) + '';
+            else
+                query += ', `' + escapeBacktick(columns[i][0]) + '`.`' + escapeBacktick(columns[i][1]) + '`';
             if (columns[i][2] !== '') {
                 query += ' AS `' + escapeBacktick(columns[0][2]) + '`';
             }