diff --git a/src/hooks/moderation/useModerationActions.ts b/src/hooks/moderation/useModerationActions.ts
index 48ae7076..b3e05c7a 100644
--- a/src/hooks/moderation/useModerationActions.ts
+++ b/src/hooks/moderation/useModerationActions.ts
@@ -140,7 +140,11 @@ export function useModerationActions(config: ModerationActionsConfig): Moderatio
                 id,
                 item_type,
                 park_submission:park_submissions!park_submission_id(*),
-                ride_submission:ride_submissions!ride_submission_id(*)
+                ride_submission:ride_submissions!ride_submission_id(*),
+                company_submission:company_submissions!company_submission_id(*),
+                ride_model_submission:ride_model_submissions!ride_model_submission_id(*),
+                timeline_event_submission:timeline_event_submissions!timeline_event_submission_id(*),
+                photo_submission:photo_submissions!photo_submission_id(*)
               `)
               .eq('submission_id', item.id)
               .in('status', ['pending', 'rejected']);
@@ -160,7 +164,26 @@ export function useModerationActions(config: ModerationActionsConfig): Moderatio
                   case 'ride':
                     itemData = item.ride_submission || {};
                     break;
+                  case 'operator':
+                  case 'manufacturer':
+                  case 'designer':
+                  case 'property_owner':
+                    itemData = item.company_submission || {};
+                    break;
+                  case 'ride_model':
+                    itemData = item.ride_model_submission || {};
+                    break;
+                  case 'milestone':
+                  case 'timeline_event':
+                    itemData = item.timeline_event_submission || {};
+                    break;
+                  case 'photo':
+                  case 'photo_edit':
+                  case 'photo_delete':
+                    itemData = item.photo_submission || {};
+                    break;
                   default:
+                    logger.warn(`Unknown item_type in validation: ${item.item_type}`);
                     itemData = {};
                 }
                 return {
diff --git a/src/lib/errorHandler.ts b/src/lib/errorHandler.ts
index e1b9b563..2e958a08 100644
--- a/src/lib/errorHandler.ts
+++ b/src/lib/errorHandler.ts
@@ -267,7 +267,10 @@ export const handleNonCriticalError = (
       p_error_message: errorMessage,
       p_error_stack: error instanceof Error ? error.stack : undefined,
       p_user_agent: navigator.userAgent,
-      p_breadcrumbs: JSON.stringify(breadcrumbs),
+      p_breadcrumbs: JSON.stringify({
+        breadcrumbs,
+        metadata: context.metadata  // Include metadata for debugging
+      }),
       p_timezone: envContext.timezone,
       p_referrer: document.referrer || undefined,
       p_duration_ms: context.duration,