diff --git a/src/blackgui/models/columnformatters.cpp b/src/blackgui/models/columnformatters.cpp
index fe8e2d3af..3e0c08b60 100644
--- a/src/blackgui/models/columnformatters.cpp
+++ b/src/blackgui/models/columnformatters.cpp
@@ -59,11 +59,13 @@ namespace BlackGui
         CVariant CDefaultFormatter::decorationRole(const CVariant &dataCVariant) const
         {
             // direct return if type is already correct
-            if (static_cast<QMetaType::Type>(dataCVariant.type()) == QMetaType::QPixmap) { return dataCVariant; }
-            if (static_cast<QMetaType::Type>(dataCVariant.type()) == QMetaType::QIcon) { return dataCVariant; }
+            const QMetaType::Type type = static_cast<QMetaType::Type>(dataCVariant.type());
+
+            if (type == QMetaType::QPixmap) { return dataCVariant; }
+            if (type == QMetaType::QIcon) { return dataCVariant; }
 
             // convert to pixmap
-            if (static_cast<QMetaType::Type>(dataCVariant.type()) == QMetaType::QImage)
+            if (type == QMetaType::QImage)
             {
                 const QImage img = dataCVariant.value<QImage>();
                 return CVariant::from(QPixmap::fromImage(img));
diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h
index f1aef4c82..960c0cfb7 100644
--- a/src/blackgui/models/columnformatters.h
+++ b/src/blackgui/models/columnformatters.h
@@ -45,6 +45,12 @@ namespace BlackGui
             //! Virtual destructor
             virtual ~CDefaultFormatter() {}
 
+            //! Copy constructor
+            CDefaultFormatter(const CDefaultFormatter &) = default;
+
+            //! Copy assignment operator
+            CDefaultFormatter &operator =(const CDefaultFormatter &) = default;
+
             //! Flags
             virtual Qt::ItemFlags flags(Qt::ItemFlags flags, bool editable) const;
 
diff --git a/src/blackgui/models/columns.h b/src/blackgui/models/columns.h
index b087dfc6d..3c9b91581 100644
--- a/src/blackgui/models/columns.h
+++ b/src/blackgui/models/columns.h
@@ -198,6 +198,14 @@ namespace BlackGui
             //! Clear
             void clear() { m_columns.clear(); }
 
+            //! Set columns @{
+            void setColumns(const QList<CColumn> &columns) { m_columns = columns; }
+            void setColumns(const CColumns &columns) { m_columns = columns.m_columns; }
+            //! @}
+
+            //! Columns
+            const QList<CColumn> &columns() const { return m_columns; }
+
         private:
             QList<CColumn> m_columns;
             QString m_translationContext;