diff --git a/legend/metrics_library/metrics/platform_ec2_metrics.j2 b/legend/metrics_library/metrics/platform_ec2_metrics.j2
index 6931e93..1b953fd 100644
--- a/legend/metrics_library/metrics/platform_ec2_metrics.j2
+++ b/legend/metrics_library/metrics/platform_ec2_metrics.j2
@@ -10,7 +10,7 @@ panels:
     formatY1: percent
     targets:
       {% for dimension in data %}
-      - query: SELECT 100 - mean(\"value\") FROM \"cpu_value\" WHERE (\"type\" = \'percent\' AND \"type_instance\" = \'idle\' AND \"host\" =~ /^{{ dimension.host }}/ AND \"type\" = \'percent\') AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT 100 - mean(`value`) FROM `cpu_value` WHERE (`type` = 'percent' AND `type_instance` = 'idle' AND `host` =~ /^{{ dimension.host }}/ AND `type` = 'percent') AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
         ref_no: 1
       {% endfor %}
@@ -29,7 +29,7 @@ panels:
     formatY1: percent
     targets:
       {% for dimension in data %}
-      - query: SELECT mean(\"value\") FROM \"memory_value\" WHERE (\"type_instance\" = \'used\' AND \"host\" =~ /^{{ dimension.host }}/ AND \"type\" = \'percent\') AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT mean(`value`) FROM `memory_value` WHERE (`type_instance` = 'used' AND `host` =~ /^{{ dimension.host }}/ AND `type` = 'percent') AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
         ref_no: 1
       {% endfor %}
@@ -48,7 +48,7 @@ panels:
     formatY1: percent
     targets:
       {% for dimension in data %}
-      - query: SELECT mean(\"value\") FROM \"df_value\" WHERE (\"type_instance\" = \'used\' AND \"host\" =~ /^{{ dimension.host }}/ AND \"type\" = \'percent_bytes\') AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT mean(`value`) FROM `df_value` WHERE (`type_instance` = 'used' AND `host` =~ /^{{ dimension.host }}/ AND `type` = 'percent_bytes') AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
         ref_no: 1
       {% endfor %}
@@ -66,7 +66,7 @@ panels:
     description: Disk IO Read/Write Operations
     targets:
       {% for dimension in data %}
-      - query: SELECT non_negative_derivative(mean(\"value\"), 1m) FROM \"disk_read\" WHERE (\"type\" = \'disk_ops\' AND \"host\" =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT non_negative_derivative(mean(`value`), 1m) FROM `disk_read` WHERE (`type` = 'disk_ops' AND `host` =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
       {% endfor %}
 
@@ -75,7 +75,7 @@ panels:
     description: Disk IO Read/Write Operations
     targets:
       {% for dimension in data %}
-      - query: SELECT non_negative_derivative(mean(\"value\"), 1m) FROM \"disk_write\" WHERE (\"type\" = \'disk_ops\' AND \"host\" =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT non_negative_derivative(mean(`value`), 1m) FROM `disk_write` WHERE (`type` = 'disk_ops' AND `host` =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
       {% endfor %}
 
@@ -85,7 +85,7 @@ panels:
     formatY1: bytes
     targets:
       {% for dimension in data %}
-      - query: SELECT non_negative_derivative(mean(\"value\"), 1s) FROM \"interface_rx\" WHERE (\"type\" = \'if_octets\' AND \"host\" =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT non_negative_derivative(mean(`value`), 1s) FROM `interface_rx` WHERE (`type` = 'if_octets' AND `host` =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
       {% endfor %}
 
@@ -95,7 +95,7 @@ panels:
     formatY1: bytes
     targets:
       {% for dimension in data %}
-      - query: SELECT non_negative_derivative(mean(\"value\"), 1s) FROM \"interface_tx\" WHERE (\"type\" = \'if_octets\' AND \"host\" =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT non_negative_derivative(mean(`value`), 1s) FROM `interface_tx` WHERE (`type` = 'if_octets' AND `host` =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
       {% endfor %}
 
@@ -104,6 +104,6 @@ panels:
     description: CPU saturation. [https://scoutapm.com/blog/understanding-load-averages]
     targets:
       {% for dimension in data %}
-      - query: SELECT mean(\"value\") FROM \"load_longterm\" WHERE (\"type\" = \'load\' AND \"host\" =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), \"host\" fill(null)
+      - query: SELECT mean(`value`) FROM `load_longterm` WHERE (`type` = 'load' AND `host` =~ /^{{ dimension.host }}/) AND $timeFilter GROUP BY time($interval), `host` fill(null)
         alias_by: $tag_host
       {% endfor %}