diff --git a/apps/stock/web-api/src/services/monitoring.service.ts b/apps/stock/web-api/src/services/monitoring.service.ts
index 4864019..b1f7e4c 100644
--- a/apps/stock/web-api/src/services/monitoring.service.ts
+++ b/apps/stock/web-api/src/services/monitoring.service.ts
@@ -76,13 +76,13 @@ export class MonitoringService {
     const stats: QueueStats[] = [];
 
     try {
-      if (!this.container.queue) {
+      if (!this.container.queueManager) {
         this.logger.warn('No queue manager available');
         return stats;
       }
 
-      // Get all queue names from the SmartQueueManager
-      const queueManager = this.container.queue as any;
+      // Get all queue names from the QueueManager
+      const queueManager = this.container.queueManager as any;
       this.logger.debug('Queue manager type:', {
         type: queueManager.constructor.name,
         hasGetAllQueues: typeof queueManager.getAllQueues === 'function',
@@ -92,7 +92,6 @@ export class MonitoringService {
 
       // Always use the known queue names since web-api doesn't create worker queues
       const handlerMapping = {
-        proxy: 'data-ingestion',
         qm: 'data-ingestion',
         ib: 'data-ingestion',
         ceo: 'data-ingestion',
@@ -127,6 +126,8 @@ export class MonitoringService {
 
           stats.push({
             name: handlerName,
+            service: serviceName,
+            queue: handlerName,
             connected: true,
             jobs: queueStats,
             workers: {
@@ -141,6 +142,8 @@ export class MonitoringService {
           this.logger.warn(`Failed to get stats for queue ${handlerName}`, { error });
           stats.push({
             name: handlerName,
+            service: serviceName,
+            queue: handlerName,
             connected: false,
             jobs: {
               waiting: 0,
diff --git a/apps/stock/web-api/src/types/monitoring.types.ts b/apps/stock/web-api/src/types/monitoring.types.ts
index 6560050..d04edd3 100644
--- a/apps/stock/web-api/src/types/monitoring.types.ts
+++ b/apps/stock/web-api/src/types/monitoring.types.ts
@@ -23,6 +23,8 @@ export interface CacheStats {
 
 export interface QueueStats {
   name: string;
+  service: string;
+  queue: string;
   connected: boolean;
   jobs: {
     waiting: number;
diff --git a/apps/stock/web-app/src/features/monitoring/components/QueueStatsTable.tsx b/apps/stock/web-app/src/features/monitoring/components/QueueStatsTable.tsx
index ca3b1a8..cae7638 100644
--- a/apps/stock/web-app/src/features/monitoring/components/QueueStatsTable.tsx
+++ b/apps/stock/web-app/src/features/monitoring/components/QueueStatsTable.tsx
@@ -30,6 +30,7 @@ export function QueueStatsTable({ queues }: QueueStatsTableProps) {
             <table className="w-full text-xs">
               <thead>
                 <tr className="border-b border-border">
+                  <th className="text-left py-2 px-3 text-text-secondary font-medium">Service</th>
                   <th className="text-left py-2 px-3 text-text-secondary font-medium">Queue</th>
                   <th className="text-center py-2 px-3 text-text-secondary font-medium">Status</th>
                   <th className="text-right py-2 px-3 text-text-secondary font-medium">Waiting</th>
@@ -46,7 +47,8 @@ export function QueueStatsTable({ queues }: QueueStatsTableProps) {
               <tbody>
                 {queues.map((queue) => (
                   <tr key={queue.name} className="border-b border-border hover:bg-surface-tertiary/50 transition-colors">
-                    <td className="py-2 px-3 font-medium text-text-primary">{queue.name}</td>
+                    <td className="py-2 px-3 font-medium text-text-primary">{queue.service}</td>
+                    <td className="py-2 px-3 font-medium text-text-primary">{queue.queue}</td>
                     <td className="py-2 px-3 text-center">
                       <span className={cn(
                         'inline-block w-2 h-2 rounded-full',
diff --git a/apps/stock/web-app/src/features/monitoring/types/index.ts b/apps/stock/web-app/src/features/monitoring/types/index.ts
index efb1000..456e326 100644
--- a/apps/stock/web-app/src/features/monitoring/types/index.ts
+++ b/apps/stock/web-app/src/features/monitoring/types/index.ts
@@ -23,6 +23,8 @@ export interface CacheStats {
 
 export interface QueueStats {
   name: string;
+  service: string;
+  queue: string;
   connected: boolean;
   jobs: {
     waiting: number;
diff --git a/libs/core/cache/src/redis-cache.ts b/libs/core/cache/src/redis-cache.ts
index 51b811d..50be98b 100644
--- a/libs/core/cache/src/redis-cache.ts
+++ b/libs/core/cache/src/redis-cache.ts
@@ -305,9 +305,22 @@ export class RedisCache implements CacheProvider {
           return null;
         }
         this.updateStats(true);
-        const parsed = JSON.parse(value);
-        this.logger.debug('Cache raw get hit', { key });
-        return parsed;
+        
+        try {
+          const parsed = JSON.parse(value);
+          this.logger.debug('Cache raw get hit', { key });
+          return parsed;
+        } catch (error) {
+          // If JSON parsing fails, log the error with more context
+          this.logger.warn('Cache getRaw JSON parse failed', { 
+            key, 
+            valueLength: value.length,
+            valuePreview: value.substring(0, 100),
+            error: error instanceof Error ? error.message : String(error)
+          });
+          // Return the raw value as-is if it can't be parsed
+          return value as unknown as T;
+        }
       },
       null,
       'getRaw'