diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
index a6d7d89ca1256b6774e53cba5555cb3858a1a097..46da985eb5c78a63b07b0eca03b4eb94f0c1fd08 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
@@ -77,9 +77,7 @@ public class ComponentMaintenancePanel extends javax.swing.JPanel
             
             itsMainFrame.setHourglassCursor();
             // and create a new root
-            String[] args = new String[1];
-            args[0]= ""+ itsComponentID;            
-            treePanel.newRootNode(treeManager.getRootNode(args));
+            treePanel.newRootNode(treeManager.getRootNode(itsComponentID));
             itsMainFrame.setNormalCursor();
         } catch (Exception e) {
             logger.debug("Exception during setNewRootNode: " + e);
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
index 6f8f201b9531daec64d0c07d00ae44d8531f8e23..f269f96e6d1aa97d271962fc1c10891bfd72be7d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
@@ -149,9 +149,7 @@ public class ResultBrowserPanel extends javax.swing.JPanel
             
             itsMainFrame.setHourglassCursor();
             // and create a new root
-            String[] args = new String[1];
-            args[0]= ""+ itsTreeID;
-            treePanel.newRootNode(treeManager.getRootNode(args));
+            treePanel.newRootNode(treeManager.getRootNode(itsTreeID));
             itsMainFrame.setNormalCursor();
         } catch (Exception e) {
             logger.debug("Exception during setNewRootNode: " + e);
@@ -207,7 +205,7 @@ public class ResultBrowserPanel extends javax.swing.JPanel
                 if (p!=null) {
                     jTabbedPane1.addTab(((IViewPanel)p).getShortName(),null,p,"");
                     ((IViewPanel)p).setMainFrame(itsMainFrame);
-                    ((IViewPanel)p).setContent(aNode);
+                    ((IViewPanel)p).setContent(aNode.getUserObject());
                 }
             } else {
                 logger.debug("Skipping panel for: "+aPanelName);
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateConstructionPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateConstructionPanel.java
index ac49d3d8e99d06f7efb99607336415643d7c0ff0..bfbb270a2d514862a36594b97b0a0b1bfec06713 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateConstructionPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateConstructionPanel.java
@@ -80,9 +80,7 @@ public class TemplateConstructionPanel extends javax.swing.JPanel
             
             itsMainFrame.setHourglassCursor();
             // and create a new root
-            String[] args = new String[1];
-            args[0]= ""+ itsTreeID;
-            treePanel.newRootNode(treeManager.getRootNode(args));
+            treePanel.newRootNode(treeManager.getRootNode(itsTreeID));
             itsMainFrame.setNormalCursor();
             
         } catch (Exception e) {
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
index e3af8dee9dcfd78d3cd02f62236b52d8a4000ce0..1fdc0b7a344442f628f751de59239568a78dac4d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
@@ -90,9 +90,7 @@ public class TemplateMaintenancePanel extends javax.swing.JPanel
             
             itsMainFrame.setHourglassCursor();
             // and create a new root
-            String[] args = new String[1];
-            args[0]= ""+ itsTreeID;
-            treePanel.newRootNode(treeManager.getRootNode(args));
+            treePanel.newRootNode(treeManager.getRootNode(itsTreeID));
             itsMainFrame.setNormalCursor();
         } catch (Exception e) {
             logger.debug("Exception during setNewRootNode: " );