diff --git a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/Common/QmitkDataSelectionWidget.cpp b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/Common/QmitkDataSelectionWidget.cpp
index cee0df5bd5..8c40e27341 100644
--- a/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/Common/QmitkDataSelectionWidget.cpp
+++ b/Plugins/org.mitk.gui.qt.multilabelsegmentation/src/internal/Common/QmitkDataSelectionWidget.cpp
@@ -1,241 +1,246 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkDataSelectionWidget.h"
 #include "internal/mitkPluginActivator.h"
 
 #include <berryPlatform.h>
 
 #include <mitkContourModel.h>
 #include <mitkContourModelSet.h>
 #include <mitkIDataStorageService.h>
 #include <mitkImage.h>
 #include <mitkLabelSetImage.h>
 #include <mitkNodePredicateAnd.h>
 #include <mitkNodePredicateOr.h>
 #include <mitkNodePredicateDataType.h>
 #include <mitkNodePredicateNot.h>
 #include <mitkNodePredicateProperty.h>
 #include <mitkProperties.h>
 #include <mitkSurface.h>
 #include <QmitkSingleNodeSelectionWidget.h>
 #include <QLabel>
 #include <algorithm>
 #include <cassert>
 #include <iterator>
 
 #include <ctkServiceReference.h>
 
 static mitk::NodePredicateBase::Pointer CreatePredicate(QmitkDataSelectionWidget::PredicateType predicateType)
 {
+  auto nonHelperObject = mitk::NodePredicateNot::New(mitk::NodePredicateOr::New(
+    mitk::NodePredicateProperty::New("helper object"),
+    mitk::NodePredicateProperty::New("hidden object")));
+
   auto imageType = mitk::TNodePredicateDataType<mitk::Image>::New();
   auto contourModelType = mitk::TNodePredicateDataType<mitk::ContourModel>::New();
   auto contourModelSetType = mitk::TNodePredicateDataType<mitk::ContourModelSet>::New();
 
-  mitk::NodePredicateAnd::Pointer segmentationPredicate = mitk::NodePredicateAnd::New();
-  segmentationPredicate->AddPredicate(mitk::TNodePredicateDataType<mitk::LabelSetImage>::New());
-  segmentationPredicate->AddPredicate(mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object")));
+  auto segmentationPredicate = mitk::TNodePredicateDataType<mitk::LabelSetImage>::New();
 
-  mitk::NodePredicateAnd::Pointer maskPredicate = mitk::NodePredicateAnd::New();
-  maskPredicate->AddPredicate(mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true)));
-  maskPredicate->AddPredicate(mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object", mitk::BoolProperty::New(true))));
+  auto maskPredicate = mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true));
 
-  mitk::NodePredicateDataType::Pointer isDwi = mitk::NodePredicateDataType::New("DiffusionImage");
-  mitk::NodePredicateDataType::Pointer isDti = mitk::NodePredicateDataType::New("TensorImage");
-  mitk::NodePredicateDataType::Pointer isOdf = mitk::NodePredicateDataType::New("OdfImage");
-  mitk::TNodePredicateDataType<mitk::Image>::Pointer isImage = mitk::TNodePredicateDataType<mitk::Image>::New();
+  auto isDwi = mitk::NodePredicateDataType::New("DiffusionImage");
+  auto isDti = mitk::NodePredicateDataType::New("TensorImage");
+  auto isOdf = mitk::NodePredicateDataType::New("OdfImage");
+  auto isImage = mitk::TNodePredicateDataType<mitk::Image>::New();
 
-  mitk::NodePredicateOr::Pointer validImages = mitk::NodePredicateOr::New();
+  auto validImages = mitk::NodePredicateOr::New();
   validImages->AddPredicate(isImage);
   validImages->AddPredicate(isDwi);
   validImages->AddPredicate(isDti);
   validImages->AddPredicate(isOdf);
 
-  mitk::NodePredicateAnd::Pointer imagePredicate = mitk::NodePredicateAnd::New();
+  auto imagePredicate = mitk::NodePredicateAnd::New();
   imagePredicate->AddPredicate(validImages);
   imagePredicate->AddPredicate(mitk::NodePredicateNot::New(segmentationPredicate));
   imagePredicate->AddPredicate(mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true))));
-  imagePredicate->AddPredicate(mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object", mitk::BoolProperty::New(true))));
 
-  mitk::NodePredicateAnd::Pointer surfacePredicate = mitk::NodePredicateAnd::New();
-  surfacePredicate->AddPredicate(mitk::TNodePredicateDataType<mitk::Surface>::New());
-  surfacePredicate->AddPredicate(mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object", mitk::BoolProperty::New(true))));
+  auto surfacePredicate = mitk::TNodePredicateDataType<mitk::Surface>::New();
+
+  mitk::NodePredicateBase::Pointer result;
 
   switch(predicateType)
   {
     case QmitkDataSelectionWidget::ImagePredicate:
-      return imagePredicate.GetPointer();
+      result = imagePredicate.GetPointer();
+      break;
 
     case QmitkDataSelectionWidget::SegmentationPredicate:
-      return segmentationPredicate.GetPointer();
+      result = segmentationPredicate.GetPointer();
+      break;
 
     case QmitkDataSelectionWidget::SurfacePredicate:
-      return surfacePredicate.GetPointer();
+      result = surfacePredicate.GetPointer();
+      break;
 
     case QmitkDataSelectionWidget::ImageAndSegmentationPredicate:
-      return imageType.GetPointer();
+      result = imageType.GetPointer();
       break;
 
     case QmitkDataSelectionWidget::ContourModelPredicate:
-      return mitk::NodePredicateOr::New(
+      result = mitk::NodePredicateOr::New(
         contourModelSetType,
         contourModelSetType).GetPointer();
       break;
 
     case QmitkDataSelectionWidget::MaskPredicate:
-      return maskPredicate.GetPointer();
+      result = maskPredicate.GetPointer();
+      break;
 
     default:
       assert(false && "Unknown predefined predicate!");
       return nullptr;
   }
+
+  return mitk::NodePredicateAnd::New(result, nonHelperObject).GetPointer();
 }
 
 QmitkDataSelectionWidget::QmitkDataSelectionWidget(QWidget* parent)
   : QWidget(parent)
 {
   m_Controls.setupUi(this);
   m_Controls.helpLabel->hide();
 }
 
 QmitkDataSelectionWidget::~QmitkDataSelectionWidget()
 {
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(QmitkDataSelectionWidget::PredicateType predicate)
 {
   QString hint = "Select node";
   QString popupTitel = "Select node";
 
   switch (predicate)
   {
   case QmitkDataSelectionWidget::ImagePredicate:
     hint = "Select an image";
     popupTitel = "Select an image";
     break;
 
   case QmitkDataSelectionWidget::MaskPredicate:
     hint = "Select a binary mask";
     popupTitel = "Select a binary mask";
     break;
 
   case QmitkDataSelectionWidget::SegmentationPredicate:
     hint = "Select an ML segmentation";
     popupTitel = "Select an ML segmentation";
     break;
 
   case QmitkDataSelectionWidget::SurfacePredicate:
     hint = "Select a surface";
     popupTitel = "Select a surface";
     break;
   }
 
   return this->AddDataSelection("", hint, popupTitel, "", predicate);
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(mitk::NodePredicateBase* predicate)
 {
   return this->AddDataSelection("", "Select a node", "Select a node", "", predicate);
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(const QString &labelText, const QString &info, const QString &popupTitel, const QString &popupHint, QmitkDataSelectionWidget::PredicateType predicate)
 {
   return this->AddDataSelection(labelText, info, popupHint, popupTitel, CreatePredicate(predicate));
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(const QString &labelText, const QString &info, const QString &popupTitel, const QString &popupHint, mitk::NodePredicateBase* predicate)
 {
   int row = m_Controls.gridLayout->rowCount();
 
   if (!labelText.isEmpty())
   {
     QLabel* label = new QLabel(labelText, m_Controls.dataSelectionWidget);
     label->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
     m_Controls.gridLayout->addWidget(label, row, 0);
   }
 
   QmitkSingleNodeSelectionWidget* nodeSelection = new QmitkSingleNodeSelectionWidget(m_Controls.dataSelectionWidget);
 
   nodeSelection->SetSelectionIsOptional(false);
   nodeSelection->SetAutoSelectNewNodes(false);
   nodeSelection->SetInvalidInfo(info);
   nodeSelection->SetPopUpTitel(popupTitel);
   nodeSelection->SetPopUpHint(popupHint);
   nodeSelection->SetDataStorage(this->GetDataStorage());
   nodeSelection->SetNodePredicate(predicate);
   nodeSelection->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
   nodeSelection->setMinimumSize(0, 40);
 
   connect(nodeSelection, &QmitkAbstractNodeSelectionWidget::CurrentSelectionChanged, this, &QmitkDataSelectionWidget::OnSelectionChanged);
 
   m_Controls.gridLayout->addWidget(nodeSelection, row, 1);
 
   m_NodeSelectionWidgets.push_back(nodeSelection);
   return static_cast<unsigned int>(m_NodeSelectionWidgets.size() - 1);
 }
 
 mitk::DataStorage::Pointer QmitkDataSelectionWidget::GetDataStorage() const
 {
     ctkServiceReference ref = mitk::PluginActivator::getContext()->getServiceReference<mitk::IDataStorageService>();
     assert(ref == true);
 
     mitk::IDataStorageService* service = mitk::PluginActivator::getContext()->getService<mitk::IDataStorageService>(ref);
 
     assert(service);
 
   return service->GetDefaultDataStorage()->GetDataStorage();
 }
 
 mitk::DataNode::Pointer QmitkDataSelectionWidget::GetSelection(unsigned int index)
 {
   assert(index < m_NodeSelectionWidgets.size());
   return m_NodeSelectionWidgets[index]->GetSelectedNode();
 }
 
 void QmitkDataSelectionWidget::SetPredicate(unsigned int index, PredicateType predicate)
 {
   this->SetPredicate(index, CreatePredicate(predicate));
 }
 
 void QmitkDataSelectionWidget::SetPredicate(unsigned int index, mitk::NodePredicateBase* predicate)
 {
   assert(index < m_NodeSelectionWidgets.size());
   m_NodeSelectionWidgets[index]->SetNodePredicate(predicate);
 }
 
 void QmitkDataSelectionWidget::SetHelpText(const QString& text)
 {
   if (!text.isEmpty())
   {
     m_Controls.helpLabel->setText(text);
 
     if (!m_Controls.helpLabel->isVisible())
       m_Controls.helpLabel->show();
   }
   else
   {
     m_Controls.helpLabel->hide();
   }
 }
 
 void QmitkDataSelectionWidget::OnSelectionChanged(QList<mitk::DataNode::Pointer> selection)
 {
   std::vector<QmitkSingleNodeSelectionWidget*>::iterator it = std::find(m_NodeSelectionWidgets.begin(), m_NodeSelectionWidgets.end(), sender());
   assert(it != m_NodeSelectionWidgets.end());
 
   const mitk::DataNode* result = nullptr;
   if (!selection.empty())
   {
     result = selection.front();
   }
   emit SelectionChanged(std::distance(m_NodeSelectionWidgets.begin(), it), result);
 }
diff --git a/Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.cpp
index 183ee609a3..98a6ced498 100644
--- a/Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.cpp
+++ b/Plugins/org.mitk.gui.qt.segmentation/src/internal/Common/QmitkDataSelectionWidget.cpp
@@ -1,229 +1,231 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkDataSelectionWidget.h"
 #include "../mitkPluginActivator.h"
 
 #include <berryIWorkbench.h>
 
 #include <mitkContourModel.h>
 #include <mitkContourModelSet.h>
 #include <mitkIDataStorageService.h>
 #include <mitkLabelSetImage.h>
 #include <mitkNodePredicateAnd.h>
 #include <mitkNodePredicateDataType.h>
 #include <mitkNodePredicateNot.h>
 #include <mitkNodePredicateOr.h>
 #include <mitkNodePredicateProperty.h>
 #include <mitkProperties.h>
 #include <mitkSurface.h>
 #include <QmitkSingleNodeSelectionWidget.h>
 #include <QLabel>
 #include <algorithm>
 #include <cassert>
 #include <iterator>
 
 static mitk::NodePredicateBase::Pointer CreatePredicate(QmitkDataSelectionWidget::Predicate predicate)
 {
   auto imageType = mitk::TNodePredicateDataType<mitk::Image>::New();
   auto labelSetImageType = mitk::TNodePredicateDataType<mitk::LabelSetImage>::New();
   auto surfaceType = mitk::TNodePredicateDataType<mitk::Surface>::New();
   auto contourModelType = mitk::TNodePredicateDataType<mitk::ContourModel>::New();
   auto contourModelSetType = mitk::TNodePredicateDataType<mitk::ContourModelSet>::New();
   auto nonLabelSetImageType = mitk::NodePredicateAnd::New(imageType, mitk::NodePredicateNot::New(labelSetImageType));
-  auto nonHelperObject = mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object"));
+  auto nonHelperObject = mitk::NodePredicateNot::New(mitk::NodePredicateOr::New(
+    mitk::NodePredicateProperty::New("helper object"),
+    mitk::NodePredicateProperty::New("hidden object")));
   auto isBinary = mitk::NodePredicateProperty::New("binary", mitk::BoolProperty::New(true));
   auto isSegmentation = mitk::NodePredicateProperty::New("segmentation", mitk::BoolProperty::New(true));
   auto isBinaryOrSegmentation = mitk::NodePredicateOr::New(isBinary, isSegmentation);
 
   mitk::NodePredicateBase::Pointer returnValue;
 
   switch(predicate)
   {
     case QmitkDataSelectionWidget::ImagePredicate:
       returnValue = mitk::NodePredicateAnd::New(
         mitk::NodePredicateNot::New(isBinaryOrSegmentation),
         nonLabelSetImageType).GetPointer();
       break;
 
     case QmitkDataSelectionWidget::SegmentationPredicate:
       returnValue = mitk::NodePredicateOr::New(
         mitk::NodePredicateAnd::New(imageType, isBinaryOrSegmentation),
         labelSetImageType).GetPointer();
       break;
 
     case QmitkDataSelectionWidget::SurfacePredicate:
       returnValue = surfaceType.GetPointer();
       break;
 
     case QmitkDataSelectionWidget::ImageAndSegmentationPredicate:
       returnValue = imageType.GetPointer();
       break;
 
     case QmitkDataSelectionWidget::ContourModelPredicate:
       returnValue = mitk::NodePredicateOr::New(
         contourModelSetType,
         contourModelSetType).GetPointer();
       break;
 
     default:
       assert(false && "Unknown predefined predicate!");
       return nullptr;
   }
 
   return mitk::NodePredicateAnd::New(returnValue, nonHelperObject).GetPointer();
 }
 
 QmitkDataSelectionWidget::QmitkDataSelectionWidget(QWidget* parent)
   : QWidget(parent)
 {
   m_Controls.setupUi(this);
   m_Controls.helpLabel->hide();
 }
 
 QmitkDataSelectionWidget::~QmitkDataSelectionWidget()
 {
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(QmitkDataSelectionWidget::Predicate predicate)
 {
   QString hint = "Select node";
   QString popupTitel = "Select node";
 
   switch (predicate)
   {
   case QmitkDataSelectionWidget::ImagePredicate:
       hint = "Select an image";
       popupTitel = "Select an image";
     break;
 
   case QmitkDataSelectionWidget::SegmentationPredicate:
       hint = "Select a segmentation";
       popupTitel = "Select a segmentation";
     break;
 
   case QmitkDataSelectionWidget::SurfacePredicate:
     hint = "Select a surface";
     popupTitel = "Select a surface";
     break;
 
   case QmitkDataSelectionWidget::ImageAndSegmentationPredicate:
     hint = "Select an image or segmentation";
     popupTitel = "Select an image or segmentation";
     break;
 
   case QmitkDataSelectionWidget::ContourModelPredicate:
     hint = "Select a contour model";
     popupTitel = "Select a contour model";
     break;
   }
 
   return this->AddDataSelection("", hint, popupTitel, "", predicate);
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(mitk::NodePredicateBase* predicate)
 {
   return this->AddDataSelection("", "Select a node", "Select a node", "", predicate);
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(const QString &labelText, const QString &info, const QString &popupTitel, const QString &popupHint, QmitkDataSelectionWidget::Predicate predicate)
 {
   return this->AddDataSelection(labelText, info, popupHint, popupTitel, CreatePredicate(predicate));
 }
 
 unsigned int QmitkDataSelectionWidget::AddDataSelection(const QString &labelText, const QString &info, const QString &popupTitel, const QString &popupHint, mitk::NodePredicateBase* predicate)
 {
   int row = m_Controls.gridLayout->rowCount();
 
   if (!labelText.isEmpty())
   {
     QLabel* label = new QLabel(labelText, m_Controls.dataSelectionWidget);
     label->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     m_Controls.gridLayout->addWidget(label, row, 0);
   }
 
   QmitkSingleNodeSelectionWidget* nodeSelection = new QmitkSingleNodeSelectionWidget(m_Controls.dataSelectionWidget);
   
   nodeSelection->SetSelectionIsOptional(false);
   nodeSelection->SetAutoSelectNewNodes(false);
   nodeSelection->SetInvalidInfo(info);
   nodeSelection->SetPopUpTitel(popupTitel);
   nodeSelection->SetPopUpHint(popupHint);
   nodeSelection->SetDataStorage(this->GetDataStorage());
   nodeSelection->SetNodePredicate(predicate);
   nodeSelection->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
   nodeSelection->setMinimumSize(0, 40);
 
   connect(nodeSelection, &QmitkAbstractNodeSelectionWidget::CurrentSelectionChanged, this, &QmitkDataSelectionWidget::OnSelectionChanged);
 
   m_Controls.gridLayout->addWidget(nodeSelection, row, 1);
 
   m_NodeSelectionWidgets.push_back(nodeSelection);
   return static_cast<unsigned int>(m_NodeSelectionWidgets.size() - 1);
 }
 
 mitk::DataStorage::Pointer QmitkDataSelectionWidget::GetDataStorage() const
 {
   ctkServiceReference ref = mitk::PluginActivator::getContext()->getServiceReference<mitk::IDataStorageService>();
   assert(ref == true);
 
   mitk::IDataStorageService* service = mitk::PluginActivator::getContext()->getService<mitk::IDataStorageService>(ref);
 
   assert(service);
 
   return service->GetDefaultDataStorage()->GetDataStorage();
 }
 
 mitk::DataNode::Pointer QmitkDataSelectionWidget::GetSelection(unsigned int index)
 {
   assert(index < m_NodeSelectionWidgets.size());
   return m_NodeSelectionWidgets[index]->GetSelectedNode();
 }
 
 void QmitkDataSelectionWidget::SetPredicate(unsigned int index, Predicate predicate)
 {
   this->SetPredicate(index, CreatePredicate(predicate));
 }
 
 void QmitkDataSelectionWidget::SetPredicate(unsigned int index, mitk::NodePredicateBase* predicate)
 {
   assert(index < m_NodeSelectionWidgets.size());
   m_NodeSelectionWidgets[index]->SetNodePredicate(predicate);
 }
 
 void QmitkDataSelectionWidget::SetHelpText(const QString& text)
 {
   if (!text.isEmpty())
   {
     m_Controls.helpLabel->setText(text);
 
     if (!m_Controls.helpLabel->isVisible())
       m_Controls.helpLabel->show();
   }
   else
   {
     m_Controls.helpLabel->hide();
   }
 }
 
 void QmitkDataSelectionWidget::OnSelectionChanged(QList<mitk::DataNode::Pointer> selection)
 {
   std::vector<QmitkSingleNodeSelectionWidget*>::iterator it = std::find(m_NodeSelectionWidgets.begin(), m_NodeSelectionWidgets.end(), sender());
   assert(it != m_NodeSelectionWidgets.end());
 
   const mitk::DataNode* result = nullptr;
   if (!selection.empty())
   {
     result = selection.front();
   }
   emit SelectionChanged(std::distance(m_NodeSelectionWidgets.begin(), it), result);
 }