diff --git a/agents/agentreq.go b/agents/agentreq.go
index 69a74dda5..944cac99e 100644
--- a/agents/agentreq.go
+++ b/agents/agentreq.go
@@ -481,10 +481,7 @@ func (ar *AgentRequest) ParseField(
 // setCGRReply will set the aReq.cgrReply based on reply coming from upstream or error
 // returns error in case of reply not converting to NavigableMap
 func (ar *AgentRequest) setCGRReply(rply utils.NavigableMapper, err error) {
-	ar.CGRReply = &utils.DataNode{
-		Type: utils.NMMapType,
-		Map:  make(map[string]*utils.DataNode),
-	}
+	ar.CGRReply.Map = make(map[string]*utils.DataNode)
 	var errMsg string
 	if err != nil {
 		errMsg = err.Error()
diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go
index c69121a2a..1c357d9cc 100644
--- a/agents/diam_it_test.go
+++ b/agents/diam_it_test.go
@@ -1489,7 +1489,7 @@ func testDiamItEmulateTerminate(t *testing.T) {
 	attrSetBalance := utils.AttrSetBalance{
 		Tenant:      "cgrates.com",
 		Account:     "testDiamItEmulateTerminate",
-		Value:       float64(1) * float64(time.Hour),
+		Value:       float64(time.Hour),
 		BalanceType: utils.MetaVoice,
 		Balance: map[string]interface{}{
 			utils.ID:         "testDiamItEmulateTerminate",
diff --git a/agents/diamagent.go b/agents/diamagent.go
index 3c9acc9ff..acd3b0869 100644
--- a/agents/diamagent.go
+++ b/agents/diamagent.go
@@ -261,7 +261,7 @@ func (da *DiameterAgent) handleMessage(c diam.Conn, m *diam.Message) {
 			da.aReqsLck.Unlock()
 		}()
 	}
-	cgrRplyNM := new(utils.DataNode)
+	cgrRplyNM := &utils.DataNode{Type: utils.NMMapType, Map: map[string]*utils.DataNode{}}
 	opts := utils.MapStorage{}
 	rply := utils.NewOrderedNavigableMap() // share it among different processors
 	var processed bool
diff --git a/agents/dnsagent_it_test.go b/agents/dnsagent_it_test.go
index 941a3934b..10762cc5d 100644
--- a/agents/dnsagent_it_test.go
+++ b/agents/dnsagent_it_test.go
@@ -195,7 +195,7 @@ func testDNSitClntNAPTRSuppliers(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	} else if len(rply.Answer) != 2 {
-		t.Errorf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
+		t.Fatalf("wrong number of records: %s", utils.ToIJSON(rply.Answer))
 	}
 	if rply.Rcode != dns.RcodeSuccess {
 		t.Errorf("failed to get an valid answer\n%v", rply)
diff --git a/agents/radagent.go b/agents/radagent.go
index 6ee53b6fc..dc5f948c9 100644
--- a/agents/radagent.go
+++ b/agents/radagent.go
@@ -79,7 +79,7 @@ func (ra *RadiusAgent) handleAuth(req *radigo.Packet) (rpl *radigo.Packet, err e
 	dcdr := newRADataProvider(req) // dcdr will provide information from request
 	rpl = req.Reply()
 	rpl.Code = radigo.AccessAccept
-	cgrRplyNM := &utils.DataNode{}
+	cgrRplyNM := &utils.DataNode{Type: utils.NMMapType, Map: map[string]*utils.DataNode{}}
 	rplyNM := utils.NewOrderedNavigableMap()
 	opts := utils.MapStorage{}
 	var processed bool
@@ -124,7 +124,7 @@ func (ra *RadiusAgent) handleAcct(req *radigo.Packet) (rpl *radigo.Packet, err e
 	dcdr := newRADataProvider(req) // dcdr will provide information from request
 	rpl = req.Reply()
 	rpl.Code = radigo.AccountingResponse
-	cgrRplyNM := &utils.DataNode{}
+	cgrRplyNM := &utils.DataNode{Type: utils.NMMapType, Map: map[string]*utils.DataNode{}}
 	rplyNM := utils.NewOrderedNavigableMap()
 	opts := utils.MapStorage{}
 	var processed bool
diff --git a/agents/sipagent.go b/agents/sipagent.go
index a12311bce..9085eab7b 100644
--- a/agents/sipagent.go
+++ b/agents/sipagent.go
@@ -303,7 +303,7 @@ func (sa *SIPAgent) handleMessage(sipMessage sipingo.Message, remoteHost string)
 	}
 	dp := utils.MapStorage(sipMessageIface)
 	var processed bool
-	cgrRplyNM := &utils.DataNode{}
+	cgrRplyNM := &utils.DataNode{Type: utils.NMMapType, Map: map[string]*utils.DataNode{}}
 	rplyNM := utils.NewOrderedNavigableMap()
 	opts := utils.MapStorage{}
 	reqVars := &utils.DataNode{
diff --git a/ees/sql.go b/ees/sql.go
index 2688f4b34..2119f9624 100644
--- a/ees/sql.go
+++ b/ees/sql.go
@@ -173,7 +173,7 @@ func (sqlEe *SQLEe) ExportEvent(cgrEv *utils.CGREvent) (err error) {
 
 	for el := eeReq.OrdNavMP[utils.MetaExp].GetFirstElement(); el != nil; el = el.Next() {
 		nmIt, _ := eeReq.OrdNavMP[utils.MetaExp].Field(el.Value)
-		pathWithoutIndex := utils.GetPathWithoutIndex(strings.Join(el.Value, utils.NestingSep))
+		pathWithoutIndex := strings.Join(el.Value[:len(el.Value)-1], utils.NestingSep) // remove the index path.index
 		if pathWithoutIndex != utils.MetaRow {
 			colNames = append(colNames, pathWithoutIndex)
 		}
diff --git a/utils/datanode.go b/utils/datanode.go
index c09c48733..056485da8 100644
--- a/utils/datanode.go
+++ b/utils/datanode.go
@@ -115,6 +115,9 @@ func (n *DataNode) Field(path []string) (*DataLeaf, error) {
 		if len(path) == 0 {
 			return nil, ErrWrongPath
 		}
+		if path[0] == Length {
+			return &DataLeaf{Data: len(n.Slice)}, nil
+		}
 		idx, err := strconv.Atoi(path[0]) // convert the path to index
 		if err != nil {
 			return nil, err
@@ -154,6 +157,9 @@ func (n *DataNode) fieldAsInterface(path []string) (interface{}, error) {
 		if len(path) == 0 {
 			return n.Slice, nil
 		}
+		if path[0] == Length {
+			return len(n.Slice), nil
+		}
 		idx, err := strconv.Atoi(path[0]) // convert the path to index
 		if err != nil {
 			return nil, err