diff --git a/client/src/History.js b/client/src/History.js
index 75fc37b..545f1f2 100644
--- a/client/src/History.js
+++ b/client/src/History.js
@@ -29,8 +29,23 @@ function History() {
       setError(null);
       try {
         const response = await axios.get('/api/history/overview', { params: { days, page: currentPage, limit: pageSize } });
-        setHistoryData(response.data.resources || []);
-        setTotalItems(response.data.total || response.data.resources?.length || 0);
+        console.log('History API Response:', response.data);
+        
+        let data = [];
+        let total = 0;
+        
+        // Handle both response formats
+        if (response.data.resources && Array.isArray(response.data.resources)) {
+          data = response.data.resources;
+          total = response.data.total || data.length;
+        } else if (Array.isArray(response.data)) {
+          data = response.data;
+          total = data.length;
+        }
+        
+        console.log('Processed history data:', { data, total });
+        setHistoryData(data);
+        setTotalItems(total);
         setLoading(false);
       } catch (error) {
         console.error('Error loading history:', error);
diff --git a/server/index.js b/server/index.js
index e7c96b7..5270d52 100644
--- a/server/index.js
+++ b/server/index.js
@@ -181,6 +181,15 @@ app.get('/api/dashboard', (req, res) => {
       type: resource.type,
       group_id: resource.group_id,
       enabled: resource.enabled,
+      check_interval: resource.check_interval,
+      timeout: resource.timeout,
+      http_keyword: resource.http_keyword,
+      http_headers: resource.http_headers,
+      quiet_hours_start: resource.quiet_hours_start,
+      quiet_hours_end: resource.quiet_hours_end,
+      cert_expiry_days: resource.cert_expiry_days,
+      sla_target: resource.sla_target,
+      email_to: resource.email_to,
       status: lastCheck?.status || 'unknown',
       uptime: stats.uptime,
       avgResponseTime: stats.avgResponseTime,