diff --git a/backend/pipelines/app/trial/creator.go b/backend/pipelines/app/trial/creator.go
index 4382f54..ecb924c 100644
--- a/backend/pipelines/app/trial/creator.go
+++ b/backend/pipelines/app/trial/creator.go
@@ -99,13 +99,15 @@ func createTrialPipeline(db *sql.DB, pipelineUuid string, pipelineName string, o
 	}
 
 	var query *task.Query
-	var uQuery *task.HttpApiUpdatedQuery
+	uQuery := new(task.HttpApiUpdatedQuery)
 	for _, qTask := range tasks.Items {
 	    if qTask.Type == task.TaskTypeQuery {
-	    	query, _ = task.GetQuery(db, qTask.Id)
-	    	uQuery.SourceUuid = sourceUuid
-	    	uQuery.SQLQuery = query.SQLQuery
-	    	_ = task.UpdateQueryTx(tx, qTask.Id, uQuery)
+	    	query, err = task.GetQuery(db, qTask.ImplementationId)
+	    	if err == nil {
+		    	uQuery.SourceUuid = sourceUuid
+		    	uQuery.SQLQuery = query.SQLQuery
+		    	_ = task.UpdateQueryTx(tx, qTask.ImplementationId, uQuery)
+		    }
 	    }
 	}
 
diff --git a/ui/src/components/pipelines/pipeline.component.js b/ui/src/components/pipelines/pipeline.component.js
index 257324e..d1aff33 100644
--- a/ui/src/components/pipelines/pipeline.component.js
+++ b/ui/src/components/pipelines/pipeline.component.js
@@ -295,6 +295,10 @@ class Pipeline extends Component {
             isOutputVisible: false,
             oldOutput: "",
         });
+
+        Array.from(document.getElementsByClassName('nodeTBD')).forEach(element => (
+            element.classList.remove('nodeTBD')
+        ));
     }
 
     setElements(elements) {
@@ -1087,6 +1091,7 @@ class Pipeline extends Component {
     closeRunningForm = async(timeoutError = false, isExternalFailure = false) => {
         await this.promisedSetState({
             isRunningFormOpen: false,
+            isPipelineRunning: false,
         });
 
         if (isExternalFailure === true) {
@@ -1407,9 +1412,9 @@ class Pipeline extends Component {
                 <Button 
                     variant="primary" 
                     onClick={() => this.openRunningForm(false)}
-                    disabled={isPipelineRunning}
+                    disabled={isPipelineRunning === true}
                 >
-                    {isPipelineRunning && (
+                    {isPipelineRunning === true && (
                         <span className="spinner-border spinner-border-sm spinner-primary"></span>
                     )}
                     Run pipeline