diff --git a/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/RefreshExperimenterDataLoader.java b/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/RefreshExperimenterDataLoader.java
index 817585aa4..49843c058 100644
--- a/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/RefreshExperimenterDataLoader.java
+++ b/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/RefreshExperimenterDataLoader.java
@@ -329,7 +329,7 @@ public void load()
                                     smartFolders = new 
                                     HashMap<SecurityContext, TreeImageSet>();
                                 smartFolders.put(ctx, (TreeImageSet) ob);
-                            } else nl.add(ob);
+                            } else nl.add(((TreeImageSet) ob).getUserObject());
                         }
                         m.put(ctx, nl);
                     }
diff --git a/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/cmd/RefreshVisitor.java b/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/cmd/RefreshVisitor.java
index c0d91858a..f63adc5b2 100644
--- a/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/cmd/RefreshVisitor.java
+++ b/src/main/java/org/openmicroscopy/shoola/agents/treeviewer/cmd/RefreshVisitor.java
@@ -106,7 +106,7 @@ public void visit(TreeImageSet node)
         	&& node.isExpanded()) {
         	parent = node.getParentDisplay();
     		if (parent.isExpanded()) 
-    			foundNodes.add(userObject);
+    			foundNodes.add(node);
     		if (!(parent.getUserObject() instanceof ProjectData)) {
     			long id = ((DataObject) userObject).getId();
                 List<Long> l = expandedTopNodes.get(DatasetData.class);
@@ -123,7 +123,7 @@ public void visit(TreeImageSet node)
         	String ns = tag.getNameSpace();
     		if (parent.isExpanded() &&
     			!TagAnnotationData.INSIGHT_TAGSET_NS.equals(ns)) 
-    			foundNodes.add(userObject);
+    			foundNodes.add(node);
     		if (!(parent.getUserObject() instanceof TagAnnotationData)) {
     			long id = ((DataObject) userObject).getId();
                 List<Long> l = expandedTopNodes.get(TagAnnotationData.class);