diff --git a/model/tablemodel.cpp b/model/tablemodel.cpp
index e97c5d6..ff57bad 100644
--- a/model/tablemodel.cpp
+++ b/model/tablemodel.cpp
@@ -78,20 +78,17 @@ QVariant TableModel::data(const QModelIndex& index, int role) const {
     case Qt::DisplayRole:
     case Qt::EditRole:
       return m_items.at(row)->data(roleForColumn);
-    case NameRole:
-    case DescriptionRole:
-    case InfoRole:
-    case TypeRole:
-    case AmountRole:
-    case FactorRole:
-    case IdRole:
-      return m_items.at(row)->data(role);
     case ToStringRole:
       return m_items.at(row)->toString();
     case ToJsonRole:
       return m_items.at(row)->toJsonObject();
+    case IdRole:
+      return m_items.at(row)->data(role);
+    default:
+      if (USER_FACING_ROLES.contains(role)) {
+        return m_items.at(row)->data(role);
+      }
   }
-
   return QVariant();
 }