diff --git a/src/oracle/oracle.controller.ts b/src/oracle/oracle.controller.ts
index 7f18391..d1ad548 100644
--- a/src/oracle/oracle.controller.ts
+++ b/src/oracle/oracle.controller.ts
@@ -343,7 +343,7 @@ export class OracleController {
     }
 
     @ApiTags('Manage Fee - Oracle')
-    @Get('/GetBondRates/:id')
+    @Get('/GetBondRates/:P_SPID/:P_ACTIVE_INACTIVE')
     GetBondRates(  
         @Param('P_SPID', ParseIntPipe) P_SPID: number,
         @Param('P_ACTIVE_INACTIVE',) P_ACTIVE_INACTIVE:string
@@ -352,7 +352,7 @@ export class OracleController {
     }
 
     @ApiTags('Manage Fee - Oracle')
-    @Get('/GetCargoRates/:id')
+    @Get('/GetCargoRates/:P_SPID/:P_ACTIVE_INACTIVE')
     GetCargoRates( 
         @Param('P_SPID', ParseIntPipe) P_SPID: number,
         @Param('P_ACTIVE_INACTIVE',) P_ACTIVE_INACTIVE:string
@@ -361,7 +361,7 @@ export class OracleController {
     }
 
     @ApiTags('Manage Fee - Oracle')
-    @Get('/GetCfFeeRates/:id')
+    @Get('/GetCfFeeRates/:P_SPID/:P_ACTIVE_INACTIVE')
     GetCfFeeRates(  
         @Param('P_SPID', ParseIntPipe) P_SPID: number,
         @Param('P_ACTIVE_INACTIVE',) P_ACTIVE_INACTIVE:string
@@ -370,7 +370,7 @@ export class OracleController {
     }
 
     @ApiTags('Manage Fee - Oracle')
-    @Get('/GetCsFeeRates/:id')
+    @Get('/GetCsFeeRates/:P_SPID/:P_ACTIVE_INACTIVE')
     GetCsFeeRates(  
         @Param('P_SPID', ParseIntPipe) P_SPID: number,
         @Param('P_ACTIVE_INACTIVE',) P_ACTIVE_INACTIVE:string
@@ -379,7 +379,7 @@ export class OracleController {
     }
 
     @ApiTags('Manage Fee - Oracle')
-    @Get('/GetEfFeeRates/:id')
+    @Get('/GetEfFeeRates/:P_SPID/:P_ACTIVE_INACTIVE')
     GetEfFeeRates(  
         @Param('P_SPID', ParseIntPipe) P_SPID: number,
         @Param('P_ACTIVE_INACTIVE',) P_ACTIVE_INACTIVE:string
@@ -388,10 +388,10 @@ export class OracleController {
     }
 
     @ApiTags('Manage Fee - Oracle')
-    @Get('/GetFeeComm/:id')
+    @Get('/GetFeeComm/:P_SPID/:P_ACTIVE_INACTIVE')
     GetFeeComm(  
         @Param('P_SPID', ParseIntPipe) P_SPID: number,
-        @Param('P_ACTIVE_INACTIVE',) P_ACTIVE_INACTIVE:string
+        @Param('P_ACTIVE_INACTIVE') P_ACTIVE_INACTIVE:string
     ) {
         return this.manageFeeService.GETFEECOMM(P_SPID,P_ACTIVE_INACTIVE)
     }
diff --git a/src/oracle/oracle.service.ts b/src/oracle/oracle.service.ts
index ed015e8..35fa7b5 100644
--- a/src/oracle/oracle.service.ts
+++ b/src/oracle/oracle.service.ts
@@ -46,7 +46,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 
@@ -88,7 +88,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 
@@ -96,10 +96,17 @@ export class OracleService {
         let connection;
         let rows = [];
         try {
-            connection = await this.oracleDBService.getConnection()
-            if (!connection) {
-                throw new Error('No DB Connected')
+            try {
+                connection = await this.oracleDBService.getConnection()
             }
+            catch (err) {
+                console.log("DB ERROR:  ", err);
+                return { error: "Error while connecting to DB" }
+            }
+
+            // if (!connection) {
+            //     throw new Error('No DB Connected')
+            // }
 
             const result = await connection.execute(
                 `BEGIN
@@ -137,7 +144,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 
@@ -272,7 +279,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
 
     }
@@ -412,7 +419,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
 
     }
@@ -462,7 +469,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
 
     }
@@ -518,7 +525,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
 
     }
@@ -623,7 +630,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 
@@ -655,7 +662,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
 
     }
@@ -752,7 +759,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 
@@ -783,7 +790,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
 
     }
@@ -837,7 +844,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
 
     }
@@ -888,7 +895,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 
@@ -949,7 +956,7 @@ export class OracleService {
             );
 
             await connection.commit();
-            
+
             let fres = await result.outBinds.p_cursor.getRows();
 
             await result.outBinds.p_cursor.close()
@@ -958,7 +965,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 
@@ -1010,7 +1017,7 @@ export class OracleService {
 
         } catch (err) {
             console.error('Error fetching users: ', err);
-            return {error: err.message}
+            return { error: err.message }
         } finally { }
     }
 }