diff --git a/src/server.js b/src/server.js
index 8a00707..9da0ea1 100644
--- a/src/server.js
+++ b/src/server.js
@@ -93,17 +93,31 @@ const init = async () => {
   });
 
   // route
-  server.route({
-    method: 'GET',
-    path: '/',
-    handler: () => ({
-      data: {
-        status: 'Ok!',
-        name: 'kasirAja Api',
-        version: '1.0.0',
+  server.route([
+    {
+      method: 'GET',
+      path: '/',
+      handler: () => ({
+        data: {
+          status: 'Ok!',
+          name: 'kasirAja Api',
+          version: '1.0.0',
+        },
+      }),
+    },
+    {
+      method: '*',
+      path: '/{p*}', // catch-all path
+      handler: (request, h) => {
+        const response = h.response({
+          status: '404',
+          message: 'Not Found',
+        });
+        response.code(404);
+        return response;
       },
-    }),
-  });
+    },
+  ]);
 
   // catch error response
   server.ext('onPreResponse', (request, h) => {
diff --git a/src/services/postgres/CategoriesService.js b/src/services/postgres/CategoriesService.js
index 01b26cb..304f496 100644
--- a/src/services/postgres/CategoriesService.js
+++ b/src/services/postgres/CategoriesService.js
@@ -10,7 +10,7 @@ class CategoriesService {
 
   async getCategories(companyId, { startDate, endDate }) {
     const query = {
-      text: 'SELECT name, description FROM categories WHERE company_id = $1 AND created_at BETWEEN $2 AND $3',
+      text: 'SELECT id, name, description FROM categories WHERE company_id = $1 AND created_at BETWEEN $2 AND $3',
       values: [companyId, startDate, endDate],
     };
 
diff --git a/src/services/postgres/ProductsService.js b/src/services/postgres/ProductsService.js
index 9eabcf2..ce4858f 100644
--- a/src/services/postgres/ProductsService.js
+++ b/src/services/postgres/ProductsService.js
@@ -12,7 +12,7 @@ class ProductsService {
   async getProducts(companyId, { startDate, endDate, withStock }) {
     let query = {
       text: `SELECT 
-              name, description, price, cost
+              id, name, description, price, cost
             FROM products
             WHERE company_id = $1 AND created_at BETWEEN $2 AND $3`,
       values: [companyId, startDate, endDate],
diff --git a/src/services/postgres/PurchasesService.js b/src/services/postgres/PurchasesService.js
index ef22e30..01af31f 100644
--- a/src/services/postgres/PurchasesService.js
+++ b/src/services/postgres/PurchasesService.js
@@ -51,7 +51,7 @@ class PurchasesService {
   async getPurchases(companyId, { startDate, endDate }) {
     const query = {
       text: `SELECT 
-              invoice, date, amount, offices.name as office_name
+              purchases.id, invoice, date, amount, offices.name as office_name
             FROM purchases 
             LEFT JOIN offices ON offices.id = purchases.office_id
             WHERE 
diff --git a/src/services/postgres/SalesService.js b/src/services/postgres/SalesService.js
index 99e59af..a6c6af2 100644
--- a/src/services/postgres/SalesService.js
+++ b/src/services/postgres/SalesService.js
@@ -67,7 +67,7 @@ class SalesService {
   async getSales(companyId, { startDate, endDate }) {
     const query = {
       text: `SELECT 
-              invoice, date, amount, offices.name as office_name
+              sales.id, invoice, date, amount, offices.name as office_name
             FROM sales 
             LEFT JOIN offices ON offices.id = sales.office_id
             WHERE 
diff --git a/src/services/postgres/UnitsService.js b/src/services/postgres/UnitsService.js
index e43d23a..c7c9b6b 100644
--- a/src/services/postgres/UnitsService.js
+++ b/src/services/postgres/UnitsService.js
@@ -10,7 +10,7 @@ class UnitsService {
 
   async getUnits(companyId, { startDate, endDate }) {
     const query = {
-      text: 'SELECT name, description FROM units WHERE company_id = $1 AND created_at BETWEEN $2 AND $3',
+      text: 'SELECT id, name, description FROM units WHERE company_id = $1 AND created_at BETWEEN $2 AND $3',
       values: [companyId, startDate, endDate],
     };