diff --git a/admin/tables.php b/admin/tables.php
index 57351b3..7f560b4 100644
--- a/admin/tables.php
+++ b/admin/tables.php
@@ -67,11 +67,11 @@ if (isset($_GET['deleted'])) {
 
 $areas = $pdo->query("SELECT * FROM areas WHERE is_deleted = 0 ORDER BY name ASC")->fetchAll();
 
-$query = "SELECT t.*, a.name as area_name 
+$query = "SELECT t.id, t.table_number, t.capacity, t.status, t.area_id, a.name as area_name 
           FROM tables t 
           LEFT JOIN areas a ON t.area_id = a.id 
           WHERE t.is_deleted = 0
-          ORDER BY a.name ASC, table_number ASC";
+          ORDER BY a.name ASC, t.`table_number` ASC";
 $tables_pagination = paginate_query($pdo, $query);
 $tables = $tables_pagination['data'];
 
@@ -262,4 +262,3 @@ function editTable(table) {
 </script>
 
 <?php include 'includes/footer.php'; ?>
-<?php // Actually, footer.php is usually included at the end. Let me fix that. ?>
diff --git a/api/tables.php b/api/tables.php
index 11afeb3..ea4a78a 100644
--- a/api/tables.php
+++ b/api/tables.php
@@ -11,11 +11,11 @@ try {
 
     // Fetch all tables with their area names, filtered by outlet_id
     $sql = "
-        SELECT t.id, table_number as name, t.capacity, a.name AS area_name, t.status
+        SELECT t.id, t.table_number as name, t.capacity, a.name AS area_name, t.status
         FROM tables t
         LEFT JOIN areas a ON t.area_id = a.id
         WHERE a.outlet_id = :outlet_id AND t.is_deleted = 0
-        ORDER BY a.name ASC, table_number ASC
+        ORDER BY a.name ASC, t.`table_number` ASC
     ";
     $stmt = $pdo->prepare($sql);
     $stmt->execute(['outlet_id' => $outlet_id]);