diff --git a/grafana/dashboards/apm-work-orders.json b/grafana/dashboards/apm-work-orders.json
index 314a951..afb69c9 100644
--- a/grafana/dashboards/apm-work-orders.json
+++ b/grafana/dashboards/apm-work-orders.json
@@ -23,7 +23,7 @@
           "uid": "athena"
         },
         "query": {
-          "rawSql": "SELECT DISTINCT dt FROM apm_wo_analysis.apm_wo_snapshots ORDER BY dt DESC",
+          "rawSQL": "SELECT DISTINCT dt FROM apm_wo_analysis.apm_wo_snapshots ORDER BY dt DESC",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -49,7 +49,7 @@
           "uid": "athena"
         },
         "query": {
-          "rawSql": "SELECT DISTINCT site FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND site<>'' ORDER BY 1",
+          "rawSQL": "SELECT DISTINCT site FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND site<>'' ORDER BY 1",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -76,7 +76,7 @@
           "uid": "athena"
         },
         "query": {
-          "rawSql": "SELECT DISTINCT department FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND department<>'' ORDER BY 1",
+          "rawSQL": "SELECT DISTINCT department FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND department<>'' ORDER BY 1",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -103,7 +103,7 @@
           "uid": "athena"
         },
         "query": {
-          "rawSql": "SELECT DISTINCT category FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND category<>'' ORDER BY 1",
+          "rawSQL": "SELECT DISTINCT category FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND category<>'' ORDER BY 1",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -130,7 +130,7 @@
           "uid": "athena"
         },
         "query": {
-          "rawSql": "SELECT DISTINCT wo_status FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND wo_status<>'' ORDER BY 1",
+          "rawSQL": "SELECT DISTINCT wo_status FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND wo_status<>'' ORDER BY 1",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -157,7 +157,7 @@
           "uid": "athena"
         },
         "query": {
-          "rawSql": "SELECT DISTINCT hold_reason FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND hold_reason<>'' ORDER BY 1",
+          "rawSQL": "SELECT DISTINCT hold_reason FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND hold_reason<>'' ORDER BY 1",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -194,7 +194,7 @@
             "type": "grafana-athena-datasource",
             "uid": "athena"
           },
-          "rawSql": "SELECT category, COUNT(*) AS wos FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' GROUP BY 1 ORDER BY 2 DESC",
+          "rawSQL": "SELECT category, COUNT(*) AS wos FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' GROUP BY 1 ORDER BY 2 DESC",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -257,7 +257,7 @@
             "type": "grafana-athena-datasource",
             "uid": "athena"
           },
-          "rawSql": "SELECT category, COUNT(*) AS escalations FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND is_escalation=true GROUP BY 1 ORDER BY 2 DESC",
+          "rawSQL": "SELECT category, COUNT(*) AS escalations FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND is_escalation=true GROUP BY 1 ORDER BY 2 DESC",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -325,7 +325,7 @@
             "type": "grafana-athena-datasource",
             "uid": "athena"
           },
-          "rawSql": "SELECT CASE WHEN is_action=true THEN 'Action Needed' ELSE 'Routine' END AS action_type, COUNT(*) AS wos FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' GROUP BY 1",
+          "rawSQL": "SELECT CASE WHEN is_action=true THEN 'Action Needed' ELSE 'Routine' END AS action_type, COUNT(*) AS wos FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' GROUP BY 1",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -381,7 +381,7 @@
             "type": "grafana-athena-datasource",
             "uid": "athena"
           },
-          "rawSql": "SELECT site, COUNT(*) AS escalations FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND is_escalation=true AND site<>'' GROUP BY 1 ORDER BY 2 DESC",
+          "rawSQL": "SELECT site, COUNT(*) AS escalations FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND is_escalation=true AND site<>'' GROUP BY 1 ORDER BY 2 DESC",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -445,7 +445,7 @@
             "type": "grafana-athena-datasource",
             "uid": "athena"
           },
-          "rawSql": "SELECT date_parse(dt, '%Y-%m-%d') AS time, SUM(CAST(is_escalation AS INTEGER)) AS escalations, SUM(CAST(is_action AS INTEGER)) AS action_needed FROM apm_wo_analysis.apm_wo_snapshots GROUP BY 1 ORDER BY 1",
+          "rawSQL": "SELECT date_parse(dt, '%Y-%m-%d') AS time, SUM(CAST(is_escalation AS INTEGER)) AS escalations, SUM(CAST(is_action AS INTEGER)) AS action_needed FROM apm_wo_analysis.apm_wo_snapshots GROUP BY 1 ORDER BY 1",
           "format": "timeSeries",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -526,7 +526,7 @@
             "type": "grafana-athena-datasource",
             "uid": "athena"
           },
-          "rawSql": "SELECT wo_number, site, department, category, wo_status, hold_reason, wo_description, last_comment FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND ('${site:raw}' = 'All' OR site IN (${site:singlequote})) AND ('${department:raw}' = 'All' OR department IN (${department:singlequote})) AND ('${category:raw}' = 'All' OR category IN (${category:singlequote})) AND ('${wo_status:raw}' = 'All' OR wo_status IN (${wo_status:singlequote})) AND ('${hold_reason:raw}' = 'All' OR hold_reason IN (${hold_reason:singlequote})) ORDER BY category, site",
+          "rawSQL": "SELECT wo_number, site, department, category, wo_status, hold_reason, wo_description, last_comment FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND ('${site:raw}' = 'All' OR site IN (${site:singlequote})) AND ('${department:raw}' = 'All' OR department IN (${department:singlequote})) AND ('${category:raw}' = 'All' OR category IN (${category:singlequote})) AND ('${wo_status:raw}' = 'All' OR wo_status IN (${wo_status:singlequote})) AND ('${hold_reason:raw}' = 'All' OR hold_reason IN (${hold_reason:singlequote})) ORDER BY category, site",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",
@@ -681,7 +681,7 @@
             "type": "grafana-athena-datasource",
             "uid": "athena"
           },
-          "rawSql": "SELECT wo_number, site, category, wo_status, hold_reason, mismatch FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND mismatch<>'' ORDER BY category, site",
+          "rawSQL": "SELECT wo_number, site, category, wo_status, hold_reason, mismatch FROM apm_wo_analysis.apm_wo_snapshots WHERE dt='$dt' AND mismatch<>'' ORDER BY category, site",
           "format": "table",
           "connectionArgs": {
             "catalog": "AwsDataCatalog",