diff --git a/controller/event/event_test.go b/controller/event/event_test.go
index 9150bf0a23965618e9823d828ae72b5564eb2155..011c6a8ed9f342d3ff1f9fb947552a08c452f30c 100644
--- a/controller/event/event_test.go
+++ b/controller/event/event_test.go
@@ -158,7 +158,7 @@ func TestNewMneUpdateEvent(t *testing.T) {
 			}
 
 			if !reflect.DeepEqual(got.PathsAndValuesMap, tt.want.PathsAndValuesMap) {
-				t.Errorf("NewMneUpdateEvent().Type = %v, want %v", got, tt.want)
+				t.Errorf("NewMneUpdateEvent().PathsAndValuesMap = %v, want %v", got, tt.want)
 			}
 		})
 	}
diff --git a/controller/nucleus/networkElementService.go b/controller/nucleus/networkElementService.go
index a41cdc3514a4ebf4be5ac429f00643e934c36e83..310f45a0268b29d359615a86044716515c9669f6 100644
--- a/controller/nucleus/networkElementService.go
+++ b/controller/nucleus/networkElementService.go
@@ -137,7 +137,7 @@ func (s *NetworkElementService) UpdateModel(networkElementToUpdate networkelemen
 		return err
 	}
 
-	// TODO (faseid): check if we want to add the paths here instead of empty map!
+	// TODO (faseid): check if we want to add the paths with values here instead of empty map!
 	pubEvent := event.NewMneUpdateEvent(networkElementToUpdate.ID(), map[string]string{})
 	if err := s.eventService.PublishEvent(NetworkElementEventTopic, pubEvent); err != nil {
 		go func() {
@@ -160,7 +160,7 @@ func (s *NetworkElementService) Update(networkElementToUpdate networkelement.Net
 		return err
 	}
 
-	// TODO (faseid): check if we want to add the paths here instead of empty map!
+	// TODO (faseid): check if we want to add the paths with values here instead of empty map!
 	pubEvent := event.NewMneUpdateEvent(networkElementToUpdate.ID(), map[string]string{})
 	if err := s.eventService.PublishEvent(NetworkElementEventTopic, pubEvent); err != nil {
 		go func() {
diff --git a/controller/nucleus/networkElementWatcher.go b/controller/nucleus/networkElementWatcher.go
index af72cb62531e7895873422d136ab9b6fbdb7af50..60900feea5d92cd130558c94d98eaac0c6116994 100644
--- a/controller/nucleus/networkElementWatcher.go
+++ b/controller/nucleus/networkElementWatcher.go
@@ -68,11 +68,11 @@ func (n *NetworkElementWatcher) SubToNetworkElements(paths [][]string, opts *gnm
 	}
 
 	for _, pnd := range pnds {
-		n.subscribeToPndNetworkElements(pnd.ID().String(), pnd, opts)
+		n.subscribeToPndNetworkElements(pnd, opts)
 	}
 }
 
-func (n *NetworkElementWatcher) subscribeToPndNetworkElements(pndID string, pnd networkdomain.NetworkDomain, opts *gnmi.SubscribeOptions) {
+func (n *NetworkElementWatcher) subscribeToPndNetworkElements(pnd networkdomain.NetworkDomain, opts *gnmi.SubscribeOptions) {
 	for _, mne := range pnd.NetworkElements() {
 		subID := uuid.New()
 
@@ -81,7 +81,7 @@ func (n *NetworkElementWatcher) subscribeToPndNetworkElements(pndID string, pnd
 			stopSubscribeCtx: stopContext,
 			stopFunc:         cancel,
 		})
-		go n.callSubscribe(stopContext, pndID, mne, opts)
+		go n.callSubscribe(stopContext, pnd.ID().String(), mne, opts)
 	}
 }