diff --git a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp
index 494fa9e1e2..5de59d0179 100644
--- a/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp
@@ -35,6 +35,8 @@
 #include "RivWellPathPartMgr.h"
 #include "RimWellPathCollection.h"
 #include "RimCellRangeFilterCollection.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
index f63ba2aa1c..1e8d04f678 100644
--- a/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
@@ -48,6 +48,8 @@
 #include "cvfRay.h"
 #include "cafEffectGenerator.h"
 #include "cvfqtUtils.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -249,6 +251,7 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* m
     {
         if (it->m_surfacePart.notNull())
         {
+            //printf("a");
             model->addPart(it->m_surfacePart.p());
         }
         if (it->m_centerLinePart.notNull())
diff --git a/ApplicationCode/ProjectDataModel/RimCase.cpp b/ApplicationCode/ProjectDataModel/RimCase.cpp
index 804c896116..5185feb536 100644
--- a/ApplicationCode/ProjectDataModel/RimCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimCase.cpp
@@ -57,6 +57,8 @@
 #include "RimCellPropertyFilterCollection.h"
 #include "RimCellEdgeResultSlot.h"
 #include "RimCaseCollection.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
 
 CAF_PDM_SOURCE_INIT(RimCase, "RimReservoir");
 
diff --git a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
index 08cc3f8f70..3c056d38ce 100644
--- a/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
+++ b/ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
@@ -45,6 +45,8 @@
 #include "RimWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
 #include "RimWellPathCollection.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
 
 CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorage, "ReservoirCellResultStorage");
 
diff --git a/ApplicationCode/ProjectDataModel/RimResultCase.cpp b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
index 3dbc0aefe6..8ed0aaf910 100644
--- a/ApplicationCode/ProjectDataModel/RimResultCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimResultCase.cpp
@@ -42,6 +42,8 @@
 #include "RimCellPropertyFilterCollection.h"
 #include "RimWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
 
 CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase");
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
index c260989597..262b4b5ad0 100644
--- a/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
@@ -63,6 +63,9 @@
 #include "cafPdmFieldCvfColor.h"
 #include "cafPdmFieldCvfMat4d.h"
 #include "RimProject.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
+
 
 //--------------------------------------------------------------------------------------------------
 /// 
diff --git a/ApplicationCode/ProjectDataModel/RimWellPath.cpp b/ApplicationCode/ProjectDataModel/RimWellPath.cpp
index 4d55f1ab25..8b8897816b 100644
--- a/ApplicationCode/ProjectDataModel/RimWellPath.cpp
+++ b/ApplicationCode/ProjectDataModel/RimWellPath.cpp
@@ -38,6 +38,8 @@
 #include "RimCellPropertyFilterCollection.h"
 #include "RimWellCollection.h"
 #include "Rim3dOverlayInfoConfig.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
 
 
 CAF_PDM_SOURCE_INIT(RimWellPath, "WellPath");
diff --git a/ApplicationCode/SocketInterface/RiaSocketServer.cpp b/ApplicationCode/SocketInterface/RiaSocketServer.cpp
index 04f69ae766..1cbc4b31b4 100644
--- a/ApplicationCode/SocketInterface/RiaSocketServer.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketServer.cpp
@@ -47,6 +47,8 @@
 
 #include "cafFactory.h"
 #include "RigGridBase.h"
+#include "RimOilField.h"
+#include "RimAnalysisModels.h"
 
 
 //--------------------------------------------------------------------------------------------------
diff --git a/cafUserInterface/cafUiTreeModelPdm.cpp b/cafUserInterface/cafUiTreeModelPdm.cpp
index c595c64e92..e43669bb1b 100644
--- a/cafUserInterface/cafUiTreeModelPdm.cpp
+++ b/cafUserInterface/cafUiTreeModelPdm.cpp
@@ -526,7 +526,17 @@ PdmUiTreeItem* UiTreeItemBuilderPdm::buildViewItems(PdmUiTreeItem* parentTreeIte
     }
 
     // NOTE: if position is -1, the item is appended to the parent tree item
-    PdmUiTreeItem* objectTreeItem = new PdmUiTreeItem(parentTreeItem, position, object);
+    PdmUiTreeItem* objectTreeItem = NULL;
+    std::vector<caf::PdmFieldHandle*> parentFields;
+    object->parentFields(parentFields);
+    if (parentFields.size() == 1 && parentFields[0]->isUiHidden())
+    {
+        objectTreeItem = parentTreeItem;
+    }
+    else
+    {
+        objectTreeItem = new PdmUiTreeItem(parentTreeItem, position, object);
+    }
 
     std::vector<caf::PdmFieldHandle*> fields;
     object->fields(fields);
@@ -535,7 +545,6 @@ PdmUiTreeItem* UiTreeItemBuilderPdm::buildViewItems(PdmUiTreeItem* parentTreeIte
     for (it = fields.begin(); it != fields.end(); it++)
     {
         caf::PdmFieldHandle* field = *it;
-        if (field->isUiHidden()) continue;
 
         std::vector<caf::PdmObject*> children;
         field->childObjects(&children);