diff --git a/main.go b/main.go
index 3216532..e2c059b 100644
--- a/main.go
+++ b/main.go
@@ -624,7 +624,7 @@ func main() {
 				if record.GetString("is_chart") == "false" {
 
 					// Extract `card_type` JSON from `record.Get("card_type")`
-					requestData := record.Get("card_type")
+					requestData := record.Get("card_type_json")
 					requestJSON, err := json.Marshal(requestData) // Convert interface{} to JSON string
 					if err != nil {
 						fmt.Println("Error encoding request data:", err)
@@ -663,16 +663,18 @@ func main() {
 					"is_chart":   record.GetString("is_chart"),
 					"chart_type": record.GetString("chart_type"),
 					// "response":      record.GetString("is_chart") = true cRes : cardResults,
-					"group_by":      record.GetString("group_by"),
-					"chart_heading": record.GetString(chartHeadingKey),
-					"tab_heading":   record.GetString(tabHeadingKey),
-					"unset_value":   record.Get("unset_value"),
-					"card_logo":     logoURL,
-					"order_id":      record.Get("order_id"),
-					"card_type":     record.Get("card_type"),
+					"group_by":        record.GetString("group_by"),
+					"chart_heading":   record.GetString(chartHeadingKey),
+					"tab_heading":     record.GetString(tabHeadingKey),
+					"unset_value":     record.Get("unset_value"),
+					"card_logo":       logoURL,
+					"order_id":        record.Get("order_id"),
+					"card_type_json":  record.Get("card_type_json"),
+					"tab_order":       record.GetString("tab_order"),
+					"chart_type_json": record.Get("chart_type_json"),
 				}
 				if record.GetString("is_chart") == "true" {
-					recordResult["response"] = cRes
+					recordResult["response"] = cResRaw
 				} else {
 					recordResult["response"] = cardResults
 				}
diff --git a/pb_data/data.db b/pb_data/data.db
index ae7cc3a..ca45235 100644
Binary files a/pb_data/data.db and b/pb_data/data.db differ
diff --git a/pb_data/data.db-shm b/pb_data/data.db-shm
index fe9ac28..89caf33 100644
Binary files a/pb_data/data.db-shm and b/pb_data/data.db-shm differ
diff --git a/pb_data/data.db-wal b/pb_data/data.db-wal
index e69de29..ca2b216 100644
Binary files a/pb_data/data.db-wal and b/pb_data/data.db-wal differ
diff --git a/pb_data/logs.db b/pb_data/logs.db
index 5bbf789..ad82992 100644
Binary files a/pb_data/logs.db and b/pb_data/logs.db differ
diff --git a/pb_data/logs.db-shm b/pb_data/logs.db-shm
index 44a6d1e..33c3cd7 100644
Binary files a/pb_data/logs.db-shm and b/pb_data/logs.db-shm differ
diff --git a/pb_data/logs.db-wal b/pb_data/logs.db-wal
index e69de29..c283e42 100644
Binary files a/pb_data/logs.db-wal and b/pb_data/logs.db-wal differ