diff --git a/pkg/catalog/loader/filter/tag_filter.go b/pkg/catalog/loader/filter/tag_filter.go
index 119b045b9..add70e2db 100644
--- a/pkg/catalog/loader/filter/tag_filter.go
+++ b/pkg/catalog/loader/filter/tag_filter.go
@@ -408,7 +408,8 @@ func New(config *Config) (*TagFilter, error) {
 			if _, ok := filter.allowedTags[val]; !ok {
 				filter.allowedTags[val] = struct{}{}
 			}
-			delete(filter.block, val)
+			// Note: only tags specified in IncludeTags should be removed from the block list
+			// not normal tags like config.Tags
 		}
 	}
 	for _, tag := range config.IncludeTags {
diff --git a/pkg/catalog/loader/filter/tag_filter_test.go b/pkg/catalog/loader/filter/tag_filter_test.go
index ad14ddf80..c73d65490 100644
--- a/pkg/catalog/loader/filter/tag_filter_test.go
+++ b/pkg/catalog/loader/filter/tag_filter_test.go
@@ -85,7 +85,7 @@ func TestTagBasedFilter(t *testing.T) {
 	})
 	t.Run("match-includes", func(t *testing.T) {
 		filter, err := New(&Config{
-			Tags:        []string{"fuzz"},
+			IncludeTags: []string{"fuzz"},
 			ExcludeTags: []string{"fuzz"},
 		})
 		require.Nil(t, err)
diff --git a/pkg/output/format_screen.go b/pkg/output/format_screen.go
index e902f942d..d468981de 100644
--- a/pkg/output/format_screen.go
+++ b/pkg/output/format_screen.go
@@ -60,7 +60,7 @@ func (w *StandardWriter) formatScreen(output *ResultEvent) []byte {
 		for i, item := range output.ExtractedResults {
 			// trim trailing space
 			item = strings.TrimSpace(item)
-			item = strconv.QuoteToASCII(item)
+			item = strings.ReplaceAll(item, "\n", "\\n") // only replace newlines
 			builder.WriteString(w.aurora.BrightCyan(item).String())
 
 			if i != len(output.ExtractedResults)-1 {
diff --git a/pkg/protocols/code/code.go b/pkg/protocols/code/code.go
index fcac9c321..9423d2006 100644
--- a/pkg/protocols/code/code.go
+++ b/pkg/protocols/code/code.go
@@ -317,7 +317,7 @@ func interpretEnvVars(source string, vars map[string]interface{}) string {
 	// bash mode
 	if strings.Contains(source, "$") {
 		for k, v := range vars {
-			source = strings.ReplaceAll(source, "$"+k, fmt.Sprintf("'%s'", v))
+			source = strings.ReplaceAll(source, "$"+k, fmt.Sprintf("%s", v))
 		}
 	}
 	// python mode