diff --git a/src/GUI/TabWidget.cpp b/src/GUI/TabWidget.cpp
index 6f10756..1bfaf1e 100644
--- a/src/GUI/TabWidget.cpp
+++ b/src/GUI/TabWidget.cpp
@@ -49,13 +49,13 @@ QVector<std::pair<QString, int>> TabWidget::getStringColumnsWithIndexes(
     const int count{model->columnCount(QModelIndex())};
     for (int column{0}; column < count; ++column)
     {
-        if (model->getColumnFormat(column) != ColumnType::STRING)
-            continue;
-
-        const QString columnName{
-            model->headerData(column, Qt::Horizontal, Qt::DisplayRole)
-                .toString()};
-        stringColumns.append({columnName, column});
+        if (model->getColumnFormat(column) == ColumnType::STRING)
+        {
+            const QString columnName{
+                model->headerData(column, Qt::Horizontal, Qt::DisplayRole)
+                    .toString()};
+            stringColumns.append({columnName, column});
+        }
     }
     return stringColumns;
 }
diff --git a/src/ModelsAndViews/DataView.cpp b/src/ModelsAndViews/DataView.cpp
index f3f86f0..0939064 100644
--- a/src/ModelsAndViews/DataView.cpp
+++ b/src/ModelsAndViews/DataView.cpp
@@ -112,23 +112,24 @@ QVector<TransactionData> DataView::fillDataFromSelection(
         if ((i % batchSize) == 0)
             QApplication::processEvents();
 
-        if (!selectionModelOfView->isSelected(proxyModel->index(i, 0)))
-            continue;
-        const QVariant& dateVariant{
-            proxyModel->index(i, transactionDateColumn).data()};
-        if (dateVariant.isNull())
-            continue;
-
-        TransactionData transactionData;
-        transactionData.date_ = dateVariant.toDate();
-        transactionData.pricePerMeter_ =
-            proxyModel->index(i, pricePerMeterColumn).data().toDouble();
-
-        if (groupByColumn != constants::NOT_SET_COLUMN)
-            transactionData.groupedBy_ =
-                proxyModel->index(i, groupByColumn).data();
-
-        calcDataContainer.append(transactionData);
+        if (selectionModelOfView->isSelected(proxyModel->index(i, 0)))
+        {
+            const QVariant& dateVariant{
+                proxyModel->index(i, transactionDateColumn).data()};
+            if (!dateVariant.isNull())
+            {
+                TransactionData transactionData;
+                transactionData.date_ = dateVariant.toDate();
+                transactionData.pricePerMeter_ =
+                    proxyModel->index(i, pricePerMeterColumn).data().toDouble();
+
+                if (groupByColumn != constants::NOT_SET_COLUMN)
+                    transactionData.groupedBy_ =
+                        proxyModel->index(i, groupByColumn).data();
+
+                calcDataContainer.append(transactionData);
+            }
+        }
     }
 
     return calcDataContainer;