diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e5391ce6..ef8ec6675 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -32,9 +32,9 @@ jobs:
           name: Execute migration
           command: |
             npm install hasura-cli -g
-            hasura migrate apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET
-            hasura metadata apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET
-            hasura metadata reload --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET
+            hasura migrate apply --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET}
+            hasura metadata apply --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET}
+            hasura metadata reload --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET}
 
   app-build:
     docker:
@@ -78,9 +78,9 @@ jobs:
           name: Execute migration
           command: |
             npm install hasura-cli -g
-            hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET
-            hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET
-            hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET
+            hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET}
+            hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET}
+            hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET}
 
   test-app-build:
     docker:
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index ed6ea6a6b..410cc0e2e 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1692,7 +1692,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.actual_completion"),
             },
-            group: "job",
+            group: "jobs",
           },
         }
       : {}),