diff --git a/smardigo/pmci/form/current-jobs.json b/smardigo/pmci/form/current-jobs.json
index 316d687..b0ea7e6 100644
--- a/smardigo/pmci/form/current-jobs.json
+++ b/smardigo/pmci/form/current-jobs.json
@@ -18,11 +18,11 @@
     },
     "components" : [ {
       "label" : "job",
-      "mask" : false,
       "hideLabel" : true,
+      "customClass" : "pb-0",
+      "mask" : false,
       "tableView" : true,
       "alwaysEnabled" : false,
-      "customClass" : "pb-0",
       "type" : "datasourcecontainer",
       "input" : true,
       "key" : "job",
@@ -36,7 +36,7 @@
         "json" : ""
       },
       "data" : {
-        "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job/query?id={{ row }}&stage={{ data.cluster.stage }}",
+        "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job/query?id={{ row }}&stage={{ data.stage }}",
         "method" : "GET",
         "values" : [ { } ]
       },
@@ -384,6 +384,15 @@
       "encrypted" : false,
       "customConditional" : "",
       "logic" : [ ],
+      "defaultValue" : {
+        "job" : {
+          "name" : "",
+          "description" : "",
+          "status" : "",
+          "id" : "",
+          "stage" : ""
+        }
+      },
       "reorder" : false
     } ],
     "tabs" : null,