diff --git a/v2/internal/runner/cloud.go b/v2/internal/runner/cloud.go
index 1a7cdc908..734660485 100644
--- a/v2/internal/runner/cloud.go
+++ b/v2/internal/runner/cloud.go
@@ -195,7 +195,7 @@ func (r *Runner) processDataSourceItem(repo, token, Type string) (string, error)
 	var secret string
 	ID, err := r.cloudClient.StatusDataSource(nucleicloud.StatusDataSourceRequest{Repo: repo, Token: token})
 	if err != nil {
-		if !strings.Contains(err.Error(), "invalid status code recieved") {
+		if !strings.Contains(err.Error(), "no rows in result set") {
 			return "", errors.Wrap(err, "could not get data source status")
 		}
 
diff --git a/v2/internal/runner/nucleicloud/cloud.go b/v2/internal/runner/nucleicloud/cloud.go
index 8c7e0291c..e06728c1d 100644
--- a/v2/internal/runner/nucleicloud/cloud.go
+++ b/v2/internal/runner/nucleicloud/cloud.go
@@ -269,7 +269,7 @@ func (c *Client) ListTargets(query string) ([]GetTargetResponse, error) {
 	_, _ = builder.WriteString("/targets")
 	if query != "" {
 		_, _ = builder.WriteString("?query=")
-		_, _ = builder.WriteString(query)
+		_, _ = builder.WriteString(url.QueryEscape(query))
 	}
 
 	var items []GetTargetResponse
@@ -296,7 +296,7 @@ func (c *Client) ListTemplates(query string) ([]GetTemplatesResponse, error) {
 	_, _ = builder.WriteString("/templates")
 	if query != "" {
 		_, _ = builder.WriteString("?query=")
-		_, _ = builder.WriteString(query)
+		_, _ = builder.WriteString(url.QueryEscape(query))
 	}
 
 	var items []GetTemplatesResponse