diff --git a/federation/service/shared_module.go b/federation/service/shared_module.go
index c47cebde6..c0e94fceb 100644
--- a/federation/service/shared_module.go
+++ b/federation/service/shared_module.go
@@ -27,6 +27,7 @@ type (
 
 func SharedModule() SharedModuleService {
 	return &sharedModule{
+		node:      *DefaultNode,
 		compose:   composeService.DefaultModule,
 		store:     DefaultStore,
 		actionlog: DefaultActionlog,
diff --git a/federation/service/sync_worker_structure.go b/federation/service/sync_worker_structure.go
index b77b91def..e0f6025fa 100644
--- a/federation/service/sync_worker_structure.go
+++ b/federation/service/sync_worker_structure.go
@@ -63,7 +63,7 @@ func (w *syncWorkerStructure) PrepareForNodes(ctx context.Context, urls chan Url
 		lastSync, _ := w.syncService.GetLastSyncTime(ctx, n.ID, types.NodeSyncTypeStructure)
 		basePath := fmt.Sprintf("/federation/nodes/%d/modules/exposed/", n.SharedNodeID)
 
-		z := []zap.Field{zap.Uint64("nodeID", n.ID)}
+		z := []zap.Field{zap.Uint64("nodeID", n.ID), zap.String("host", n.BaseURL)}
 
 		if lastSync != nil {
 			z = append(z, zap.Time("lastSync", *lastSync))
@@ -167,14 +167,11 @@ func (w *syncWorkerStructure) Watch(ctx context.Context, delay time.Duration, li
 			countProcess += processed
 
 			if err != nil {
-				spew.Dump("ERR", err)
-				// handle error
 				w.logger.Info("error on handling payload", zap.Error(err))
 			} else {
 				n, err := DefaultNode.FindBySharedNodeID(ctx, p.Meta.(*structureProcesser).SharedNodeID)
 
 				if err != nil {
-					spew.Dump("ERR", err)
 					w.logger.Info("could not update sync status", zap.Error(err))
 					continue
 				}
@@ -190,11 +187,10 @@ func (w *syncWorkerStructure) Watch(ctx context.Context, delay time.Duration, li
 				new, err = DefaultNodeSync.Create(ctx, new)
 
 				if err != nil {
-					spew.Dump("ERR", err)
 					w.logger.Info("could not update sync status", zap.Error(err))
 				}
 
-				w.logger.Info("processed objects", zap.Int("processed", processed), zap.Uint64("nodeID", n.ID))
+				w.logger.Info("processed objects", zap.Int("processed", processed), zap.Uint64("nodeID", n.ID), zap.String("host", n.BaseURL))
 			}
 		}
 	}
diff --git a/store/rdbms/federation_shared_modules.go b/store/rdbms/federation_shared_modules.go
index 4211525a3..049ae4c75 100644
--- a/store/rdbms/federation_shared_modules.go
+++ b/store/rdbms/federation_shared_modules.go
@@ -24,6 +24,10 @@ func (s Store) convertFederationSharedModuleFilter(f types.SharedModuleFilter) (
 		query = query.Where("cmd.name = ?", f.Name)
 	}
 
+	if f.ExternalFederationModuleID > 0 {
+		query = query.Where("cmd.xref_module = ?", f.ExternalFederationModuleID)
+	}
+
 	if f.Query != "" {
 		q := "%" + strings.ToLower(f.Query) + "%"
 		query = query.Where(squirrel.Or{