diff --git a/solr/templates/solr-exporter-config.xml b/solr/templates/solr-exporter-config.xml
index 232f5495..3840092c 100644
--- a/solr/templates/solr-exporter-config.xml
+++ b/solr/templates/solr-exporter-config.xml
@@ -1636,7 +1636,8 @@
             }
             end
           </str>
-	  <!-- Custom metrics -->
+          
+          <!-- Custom metrics -->
           <str>
             .metrics | to_entries | .[] | select(.key | startswith("solr.core.")) as $parent |
             $parent.key | split(".") as $parent_key_items |
@@ -1649,12 +1650,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.count) as $value |
             {
-            name: "solr_metrics_core_query_count",
-            type: "COUNTER",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_count",
+              type: "COUNTER",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1687,14 +1688,14 @@
             (if $parent_key_item_len == 5 then $parent_key_items[4] else "" end) as $replica |
             (if $parent_key_item_len == 5 then ($collection + "_" + $shard + "_" + $replica) else $core end) as $core |
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
-            ($object.value.1minRate) as $value |
+            ($object.value."1minRate") as $value |
             {
-            name: "solr_metrics_core_query_1minrate",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_1minrate",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1707,14 +1708,14 @@
             (if $parent_key_item_len == 5 then $parent_key_items[4] else "" end) as $replica |
             (if $parent_key_item_len == 5 then ($collection + "_" + $shard + "_" + $replica) else $core end) as $core |
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
-            ($object.value.5minRate) as $value |
+            ($object.value."5minRate") as $value |
             {
-            name: "solr_metrics_core_query_5minrate",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_5minrate",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1727,14 +1728,14 @@
             (if $parent_key_item_len == 5 then $parent_key_items[4] else "" end) as $replica |
             (if $parent_key_item_len == 5 then ($collection + "_" + $shard + "_" + $replica) else $core end) as $core |
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
-            ($object.value.15minRate) as $value |
+            ($object.value."15minRate") as $value |
             {
-            name: "solr_metrics_core_query_15minrate",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_15minrate",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1749,12 +1750,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.min_ms) as $value |
             {
-            name: "solr_metrics_core_query_min_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_min_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1769,12 +1770,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.max_ms) as $value |
             {
-            name: "solr_metrics_core_query_max_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_max_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1789,12 +1790,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.mean_ms) as $value |
             {
-            name: "solr_metrics_core_query_mean_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_mean_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1809,12 +1810,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.median_ms) as $value |
             {
-            name: "solr_metrics_core_query_median_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_median_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1829,12 +1830,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.stddev_ms) as $value |
             {
-            name: "solr_metrics_core_query_stddev_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_stddev_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1849,12 +1850,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.p75_ms) as $value |
             {
-            name: "solr_metrics_core_query_p75_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_p75_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1869,12 +1870,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.p95_ms) as $value |
             {
-            name: "solr_metrics_core_query_p95_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_p95_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1889,12 +1890,12 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.p99_ms) as $value |
             {
-            name: "solr_metrics_core_query_p99_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_p99_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>
           <str>
@@ -1909,16 +1910,15 @@
             $parent.value | to_entries | .[] | select(.key | endswith("select.requestTimes")) as $object |
             ($object.value.p999_ms) as $value |
             {
-            name: "solr_metrics_core_query_p999_ms",
-            type: "GAUGE",
-            help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
-            label_names: ["core", "collection", "shard", "replica"],
-            label_values: [$core, $collection, $shard, $replica],
-            value: $value
+              name: "solr_metrics_core_query_p999_ms",
+              type: "GAUGE",
+              help: "See following URL: https://lucene.apache.org/solr/guide/metrics-reporting.html",
+              label_names: ["core", "collection", "shard", "replica"],
+              label_values: [$core, $collection, $shard, $replica],
+              value: $value
             }
           </str>          
-	   <!-- end of custom metrics -->
-
+          <!-- end of custom metrics -->
         </arr>
       </lst>
     </metrics>