diff --git a/pkg/dal/utils.go b/pkg/dal/utils.go
index dae260b66..c3b705165 100644
--- a/pkg/dal/utils.go
+++ b/pkg/dal/utils.go
@@ -348,7 +348,7 @@ func prepareGenericRowTester(f internalFilter) (_ tester, err error) {
 			}
 			pcNode.Traverse(func(a *ql.ASTNode) (bool, *ql.ASTNode, error) {
 				if a.Symbol != "" {
-					a.Symbol = strings.Replace(a.Symbol, ".", "___DLMTR___", -1)
+					a.Symbol = wrapNestedGvalIdent(a.Symbol)
 				}
 				return true, a, nil
 			})
diff --git a/system/service/report.go b/system/service/report.go
index 65e77e815..743563513 100644
--- a/system/service/report.go
+++ b/system/service/report.go
@@ -350,7 +350,7 @@ func (svc *report) Run(ctx context.Context, reportID uint64, dd reporting.FrameD
 		// Run the reports and produce the frames
 		// @todo this can be ran in paralel
 		for _, run := range runs {
-			func() (err error) {
+			err = func() (err error) {
 				iter, err = svc.pipelineRunner.Run(ctx, run.Pipeline)
 				if err != nil {
 					return
@@ -370,6 +370,10 @@ func (svc *report) Run(ctx context.Context, reportID uint64, dd reporting.FrameD
 				out = append(out, ff...)
 				return
 			}()
+
+			if err != nil {
+				return
+			}
 		}
 
 		return nil